pygeoinf 1.2.6__py3-none-any.whl → 1.2.8__py3-none-any.whl

pygeoinf/__init__.py

@@ -9,6 +9,7 @@ from .random_matrix import (
     random_svd,
     random_eig,
     random_cholesky,
+    random_diagonal,
 )
 
 from .hilbert_space import (
@@ -34,7 +35,11 @@ from .nonlinear_operators import NonLinearOperator
 
 from .linear_operators import (
     LinearOperator,
-    DiagonalLinearOperator,
+    MatrixLinearOperator,
+    DenseMatrixLinearOperator,
+    SparseMatrixLinearOperator,
+    DiagonalSparseMatrixLinearOperator,
+    NormalSumOperator,
 )
 
 

pygeoinf/gaussian_measure.py

@@ -28,11 +28,11 @@ from scipy.sparse import diags
 from scipy.stats import multivariate_normal
 
 
-from .hilbert_space import EuclideanSpace, HilbertModule
+from .hilbert_space import EuclideanSpace, HilbertModule, Vector
 
 from .linear_operators import (
     LinearOperator,
-    DiagonalLinearOperator,
+    DiagonalSparseMatrixLinearOperator,
 )
 
 from .direct_sum import (
@@ -40,17 +40,6 @@ from .direct_sum import (
 )
 
 
-# This block only runs for type checkers, not at runtime, to prevent
-# circular import errors while still allowing type hints.
-if TYPE_CHECKING:
-    from .hilbert_space import HilbertSpace, EuclideanSpace
-    from .operators import LinearOperator, DiagonalLinearOperator
-    from .direct_sum import BlockDiagonalLinearOperator
-
-# Define a generic type for vectors in a Hilbert space
-Vector = TypeVar("Vector")
-
-
 class GaussianMeasure:
     """
     Represents a Gaussian measure on a Hilbert space.
@@ -76,29 +65,29 @@ class GaussianMeasure:
         inverse_covariance_factor: LinearOperator = None,
     ) -> None:
         """
-        Initializes the GaussianMeasure.
+         Initializes the GaussianMeasure.
 
         The measure can be defined in several ways, primarily by providing
-        either a covariance operator or a covariance factor.
-
-        Args:
-            covariance (LinearOperator, optional): A self-adjoint and positive
-                semi-definite linear operator on the domain.
-            covariance_factor (LinearOperator, optional): A linear operator L
-                such that the covariance C = L @ L*.
-            expectation (vector, optional): The expectation (mean) of the
-                measure. Defaults to the zero vector of the space.
-            sample (callable, optional): A function that returns a random
-                sample from the measure. If a `covariance_factor` is given,
-                a default sampler is created.
-            inverse_covariance (LinearOperator, optional): The inverse of the
-                covariance operator (the precision operator).
-            inverse_covariance_factor (LinearOperator, optional): A factor Li
-                of the inverse covariance, such that C_inv = Li.T @ Li.
-
-        Raises:
-            ValueError: If neither `covariance` nor `covariance_factor`
-                is provided.
+         either a covariance operator or a covariance factor.
+
+         Args:
+             covariance (LinearOperator, optional): A self-adjoint and positive
+                 semi-definite linear operator on the domain.
+             covariance_factor (LinearOperator, optional): A linear operator L
+                 such that the covariance C = L @ L*.
+             expectation (vector, optional): The expectation (mean) of the
+                 measure. Defaults to the zero vector of the space.
+             sample (callable, optional): A function that returns a random
+                 sample from the measure. If a `covariance_factor` is given,
+                 a default sampler is created.
+             inverse_covariance (LinearOperator, optional): The inverse of the
+                 covariance operator (the precision operator).
+             inverse_covariance_factor (LinearOperator, optional): A factor Li
+                 of the inverse covariance, such that C_inv = Li.T @ Li.
+
+         Raises:
+             ValueError: If neither `covariance` nor `covariance_factor`
+                 is provided.
         """
         if covariance is None and covariance_factor is None:
             raise ValueError(
@@ -186,8 +175,8 @@ class GaussianMeasure:
                 "Standard deviation vector does not have the correct length"
             )
         euclidean = EuclideanSpace(domain.dim)
-        covariance_factor = DiagonalLinearOperator(
-            euclidean, domain, standard_deviations, galerkin=True
+        covariance_factor = DiagonalSparseMatrixLinearOperator.from_diagonal_values(
+            euclidean, domain, standard_deviations
         )
         return GaussianMeasure(
             covariance_factor=covariance_factor,