Merge pull request #702 from CUQI-DTU/update_experimental

Move algebra and _ProductGeometry to main cuqi library

Author: amal-ghamdi

cuqi/__init__.py

@@ -1,6 +1,7 @@
 from . import data
 from . import density
 from . import diagnostics
+from . import algebra
 from . import distribution
 from . import experimental
 from . import geometry

cuqi/algebra/__init__.py

@@ -0,0 +1,2 @@
+from ._abstract_syntax_tree import VariableNode, Node
+from ._random_variable import RandomVariable

cuqi/experimental/algebra/_ast.py renamed to cuqi/algebra/_abstract_syntax_tree.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import List, Any, Union
-from ._ast import VariableNode, Node
-from ._orderedset import _OrderedSet
+from ._abstract_syntax_tree import VariableNode, Node
+from ._ordered_set import _OrderedSet
 import operator
 import cuqi
 from cuqi.distribution import Distribution
@@ -58,7 +58,7 @@ class RandomVariable:
 
         from cuqi.testproblem import Deconvolution1D
         from cuqi.distribution import Gaussian, Gamma, GMRF
-        from cuqi.experimental.algebra import RandomVariable
+        from cuqi.algebra import RandomVariable
         from cuqi.problem import BayesianProblem
 
         import numpy as np
@@ -79,7 +79,7 @@ class RandomVariable:
     .. code-block:: python
 
         from cuqi.distribution import Gaussian, Gamma
-        from cuqi.experimental.algebra import RandomVariable, VariableNode
+        from cuqi.algebra import RandomVariable, VariableNode
 
         # Define the variables
         x = VariableNode('x')

cuqi/experimental/algebra/_orderedset.py renamed to cuqi/algebra/_ordered_set.py

@@ -419,5 +419,5 @@ def __repr__(self) -> str:
     @property
     def rv(self):
         """ Return a random variable object representing the distribution. """
-        from cuqi.experimental.algebra import RandomVariable
+        from cuqi.algebra import RandomVariable
         return RandomVariable(self)

cuqi/experimental/algebra/_randomvariable.py renamed to cuqi/algebra/_random_variable.py

@@ -62,16 +62,16 @@ class JointDistribution:
         posterior = joint(y=y_obs)
         
     """
-    def __init__(self, *densities: [Density, cuqi.experimental.algebra.RandomVariable]):
+    def __init__(self, *densities: [Density, cuqi.algebra.RandomVariable]):
         """ Create a joint distribution from the given densities. """
 
         # Check if all RandomVariables are simple (not-transformed)
         for density in densities:
-            if isinstance(density, cuqi.experimental.algebra.RandomVariable) and density.is_transformed:
+            if isinstance(density, cuqi.algebra.RandomVariable) and density.is_transformed:
                 raise ValueError(f"To be used in {self.__class__.__name__}, all RandomVariables must be untransformed.")
 
         # Convert potential random variables to their underlying distribution
-        densities = [density.distribution if isinstance(density, cuqi.experimental.algebra.RandomVariable) else density for density in densities]
+        densities = [density.distribution if isinstance(density, cuqi.algebra.RandomVariable) else density for density in densities]
 
         # Ensure all densities have unique names
         names = [density.name for density in densities]

cuqi/distribution/_distribution.py

@@ -1,4 +1,2 @@
 """ Experimental module for testing new features and ideas.  """
-from . import algebra
-from . import geometry
 from ._recommender import SamplerRecommender