CUQIpy 0.2.0.post0.dev116__tar.gz → 0.3.0__tar.gz

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/CUQIpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CUQIpy
-Version: 0.2.0.post0.dev116
+Version: 0.3.0
 Summary: Computational Uncertainty Quantification for Inverse problems in Python
 Maintainer-email: "Nicolai A. B. Riis" <nabr@dtu.dk>, "Jakob S. Jørgensen" <jakj@dtu.dk>, "Amal M. Alghamdi" <amaal@dtu.dk>
 License:                                  Apache License

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/CUQIpy.egg-info/SOURCES.txt

@@ -13,6 +13,8 @@ cuqi/_messages.py
 cuqi/_version.py
 cuqi/config.py
 cuqi/diagnostics.py
+cuqi/array/__init__.py
+cuqi/array/_array.py
 cuqi/data/__init__.py
 cuqi/data/_data.py
 cuqi/data/astronaut.npz

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CUQIpy
-Version: 0.2.0.post0.dev116
+Version: 0.3.0
 Summary: Computational Uncertainty Quantification for Inverse problems in Python
 Maintainer-email: "Nicolai A. B. Riis" <nabr@dtu.dk>, "Jakob S. Jørgensen" <jakj@dtu.dk>, "Amal M. Alghamdi" <amaal@dtu.dk>
 License:                                  Apache License

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/__init__.py

@@ -9,6 +9,7 @@ from . import operator
 from . import pde
 from . import problem
 from . import sampler
+from . import array
 from . import samples
 from . import solver
 from . import testproblem

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-02-22T10:07:14+0100",
+ "date": "2023-02-22T10:23:18+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "336a1e76c4a7d7896ccb72c51fc5a4487c00eb1b",
- "version": "0.2.0.post0.dev116"
+ "full-revisionid": "e122312d87e155e56afba81b81b0b880b545f99f",
+ "version": "0.3.0"
 }
 '''  # END VERSION_JSON
 

CUQIpy-0.3.0/cuqi/array/__init__.py

@@ -0,0 +1 @@
+from ._array import CUQIarray

CUQIpy-0.3.0/cuqi/array/_array.py

@@ -0,0 +1,108 @@
+import numpy as np
+from cuqi.geometry import _DefaultGeometry
+
+
+class CUQIarray(np.ndarray):
+    """
+    A class to represent data arrays, subclassed from numpy array, along with geometry and plotting
+
+    Parameters
+    ----------
+    input_array : ndarray
+        A numpy array holding the parameter or function values. 
+    
+    is_par : bool, default True
+        Boolean flag whether input_array is to be interpreted as parameter (True) or function values (False).
+
+    geometry : cuqi.geometry.Geometry, default None
+        Contains the geometry related of the data
+
+    Attributes
+    ----------
+    funvals : CUQIarray
+        Returns itself as function values.
+
+    parameters : CUQIarray
+        Returns itself as parameters.
+
+    Methods
+    ----------
+    :meth:`plot`: Plots the data as function or parameters.
+    """
+
+    def __repr__(self) -> str: 
+        return "CUQIarray: NumPy array wrapped with geometry.\n" + \
+               "---------------------------------------------\n\n" + \
+            "Geometry:\n {}\n\n".format(self.geometry) + \
+            "Parameters:\n {}\n\n".format(self.is_par) + \
+            "Array:\n" + \
+            super().__repr__()
+
+    def __new__(cls, input_array, is_par=True, geometry=None):
+        # Input array is an already formed ndarray instance
+        # We first cast to be our class type
+        obj = np.asarray(input_array).view(cls)
+        # add the new attribute to the created instance
+        obj.is_par = is_par
+        if (not is_par) and (geometry is None):
+            raise ValueError("geometry cannot be none when initializing a CUQIarray as function values (with is_par False).")
+        if is_par and (obj.ndim>1):
+            raise ValueError("input_array cannot be multidimensional when initializing CUQIarray as parameter (with is_par True).")
+        if geometry is None:
+            geometry = _DefaultGeometry(grid=obj.__len__())
+        obj.geometry = geometry
+        # Finally, we must return the newly created object:
+        return obj
+
+    def __array_finalize__(self, obj):
+        # see InfoArray.__array_finalize__ for comments
+        if obj is None: return
+        self.is_par = getattr(obj, 'is_par', True)
+        self.geometry = getattr(obj, 'geometry', None)
+
+    @property
+    def funvals(self):
+        if self.is_par is True:
+            vals = self.geometry.par2fun(self)
+        else:
+            vals = self
+
+        if isinstance(vals, np.ndarray):
+            if vals.dtype == np.dtype('O'):
+                # if vals is of type np.ndarray, but the data type of the array
+                # is object (e.g. FEniCS function), then extract the object and
+                # return it. reshape(1) is needed to convert the shape from
+                # () to (1,).
+                return self.reshape(1)[0]
+            else:
+                # else, cast the np.ndarray to a CUQIarray
+                return type(self)(vals,is_par=False,geometry=self.geometry) #vals.view(np.ndarray)
+        else:
+            return vals 
+
+    @property
+    def parameters(self):
+        if self.is_par is False:
+            vals = self.geometry.fun2par(self)
+        else:
+            vals = self
+        return type(self)(vals,is_par=True,geometry=self.geometry)
+
+    def to_numpy(self):
+        """Return a numpy array of the CUQIarray data. If is_par is True, then 
+        the parameters are returned as numpy.ndarray. If is_par is False, then 
+        the function values are returned instead.
+        """
+        try:
+            return self.view(np.ndarray)
+        except:
+            raise ValueError(
+                f"Cannot convert {self.__class__.__name__} to numpy array")
+
+    def plot(self, plot_par=False, **kwargs):
+        if plot_par:
+            kwargs["is_par"]=True
+            return self.geometry.plot(self.parameters, plot_par=plot_par, **kwargs)
+        else:
+            kwargs["is_par"]=False
+            return self.geometry.plot(self.funvals, **kwargs)

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/distribution/_distribution.py

@@ -5,7 +5,8 @@ from copy import copy
 from functools import partial
 from cuqi.density import Density, EvaluatedDensity
 from cuqi.likelihood import Likelihood
-from cuqi.samples import Samples, CUQIarray
+from cuqi.samples import Samples
+from cuqi.array import CUQIarray
 from cuqi.geometry import _DefaultGeometry, Geometry
 from cuqi.utilities import infer_len, get_writeable_attributes, get_writeable_properties, get_non_default_args, get_indirect_variables
 import numpy as np # To be replaced by cuqi.array_api

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/likelihood/_likelihood.py

@@ -21,7 +21,7 @@ class Likelihood(Density):
     distribution : ~cuqi.distribution.Distribution
         | Distribution to create likelihood from.
     
-    data : ~cuqi.samples.CUQIarray or array_like
+    data : ~cuqi.array.CUQIarray or array_like
         | Observation to create likelihood from.
 
     """

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/model/_model.py

@@ -2,7 +2,8 @@ import numpy as np
 from scipy.sparse import csc_matrix
 from scipy.sparse import hstack
 from scipy.linalg import solve
-from cuqi.samples import Samples, CUQIarray
+from cuqi.samples import Samples
+from cuqi.array import CUQIarray
 from cuqi.geometry import Geometry, _DefaultGeometry, _get_identity_geometries
 import cuqi
 import matplotlib.pyplot as plt
@@ -93,7 +94,7 @@ class Model(object):
 
         Parameters
         ----------
-        x : ndarray or cuqi.samples.CUQIarray
+        x : ndarray or cuqi.array.CUQIarray
             The input value to be converted.
 
         geometry : cuqi.geometry.Geometry
@@ -105,7 +106,7 @@ class Model(object):
 
         Returns
         -------
-        ndarray or cuqi.samples.CUQIarray
+        ndarray or cuqi.array.CUQIarray
             The input value represented as a function.
         """
         if type(x) is CUQIarray and not isinstance(x.geometry, _DefaultGeometry):
@@ -120,18 +121,18 @@ class Model(object):
 
         Parameters
         ----------
-        out : ndarray or cuqi.samples.CUQIarray
+        out : ndarray or cuqi.array.CUQIarray
             The output value to be converted.
 
         geometry : cuqi.geometry.Geometry
             The geometry representing the argument `out`.
 
         to_CUQIarray : bool
-            If True, the output is wrapped as a cuqi.samples.CUQIarray.
+            If True, the output is wrapped as a cuqi.array.CUQIarray.
 
         Returns
         -------
-        ndarray or cuqi.samples.CUQIarray
+        ndarray or cuqi.array.CUQIarray
             The output value represented as parameters.
         """ 
         out = geometry.fun2par(out)
@@ -156,7 +157,7 @@ class Model(object):
         func_domain_geometry : cuqi.geometry.Geometry
             The geometry representing the function `func` domain.
 
-        x : ndarray or cuqi.samples.CUQIarray
+        x : ndarray or cuqi.array.CUQIarray
             The input value to the operator.
 
         is_par : bool
@@ -165,7 +166,7 @@ class Model(object):
 
         Returns
         -------
-        ndarray or cuqi.samples.CUQIarray
+        ndarray or cuqi.array.CUQIarray
             The output of the function `func` converted to parameters.
         """ 
         # If input x is Samples we apply func for each sample
@@ -211,7 +212,7 @@ class Model(object):
 
         Parameters
         ----------
-        *args : ndarray or cuqi.samples.CUQIarray
+        *args : ndarray or cuqi.array.CUQIarray
             The model input.
 
         is_par : bool
@@ -223,7 +224,7 @@ class Model(object):
 
         Returns
         -------
-        ndarray or cuqi.samples.CUQIarray
+        ndarray or cuqi.array.CUQIarray
             The model output. Always returned as parameters.
         """
 
@@ -426,12 +427,12 @@ class LinearModel(Model):
 
         Parameters
         ----------
-        y : ndarray or cuqi.samples.CUQIarray
+        y : ndarray or cuqi.array.CUQIarray
             The adjoint model input.
 
         Returns
         -------
-        ndarray or cuqi.samples.CUQIarray
+        ndarray or cuqi.array.CUQIarray
             The adjoint model output. Always returned as parameters.
         """
         return self._apply_func(self._adjoint_func,

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/problem/_problem.py

@@ -11,7 +11,7 @@ from cuqi.model import LinearModel, Model
 from cuqi.likelihood import Likelihood
 from cuqi.geometry import _DefaultGeometry
 from cuqi.utilities import ProblemInfo
-from cuqi.samples import CUQIarray
+from cuqi.array import CUQIarray
 
 from copy import copy
 
@@ -228,7 +228,7 @@ class BayesianProblem(object):
         x_ML, solver_info = self._solve_max_point(self.likelihood, disp=disp, x0=x0)
 
         # Wrap the result in a CUQIarray and add solver info
-        x_ML = cuqi.samples.CUQIarray(x_ML, geometry=self.likelihood.geometry)
+        x_ML = cuqi.array.CUQIarray(x_ML, geometry=self.likelihood.geometry)
         x_ML.info = solver_info
 
         return x_ML
@@ -285,7 +285,7 @@ class BayesianProblem(object):
             x_MAP, solver_info = self._solve_max_point(self.posterior, disp=disp, x0=x0)
 
         # Wrap the result in a CUQIarray and add solver info
-        x_MAP = cuqi.samples.CUQIarray(x_MAP, geometry=self.posterior.geometry)
+        x_MAP = cuqi.array.CUQIarray(x_MAP, geometry=self.posterior.geometry)
         x_MAP.info = solver_info
         return x_MAP
 

CUQIpy-0.3.0/cuqi/samples/__init__.py

@@ -0,0 +1 @@
+from ._samples import Samples

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/samples/_samples.py

@@ -1,168 +1,12 @@
-import warnings
 import numpy as np
 import matplotlib.pyplot as plt
 from cuqi.diagnostics import Geweke
 from cuqi.geometry import _DefaultGeometry, Continuous2D, Image2D
+from cuqi.array import CUQIarray
 from copy import copy
 import arviz # Plotting tool
 
 
-class CUQIarray(np.ndarray):
-    """
-    A class to represent data arrays, subclassed from numpy array, along with geometry and plotting
-
-    Parameters
-    ----------
-    input_array : ndarray
-        A numpy array holding the parameter or function values. 
-    
-    is_par : bool, default True
-        Boolean flag whether input_array is to be interpreted as parameter (True) or function values (False).
-
-    geometry : cuqi.geometry.Geometry, default None
-        Contains the geometry related of the data
-
-    Attributes
-    ----------
-    funvals : CUQIarray
-        Returns itself as function values.
-
-    parameters : CUQIarray
-        Returns itself as parameters.
-
-    Methods
-    ----------
-    :meth:`plot`: Plots the data as function or parameters.
-    """
-
-    def __repr__(self) -> str: 
-        return "CUQIarray: NumPy array wrapped with geometry.\n" + \
-               "---------------------------------------------\n\n" + \
-            "Geometry:\n {}\n\n".format(self.geometry) + \
-            "Parameters:\n {}\n\n".format(self.is_par) + \
-            "Array:\n" + \
-            super().__repr__()
-
-    def __new__(cls, input_array, is_par=True, geometry=None):
-        # Input array is an already formed ndarray instance
-        # We first cast to be our class type
-        obj = np.asarray(input_array).view(cls)
-        # add the new attribute to the created instance
-        obj.is_par = is_par
-        if (not is_par) and (geometry is None):
-            raise ValueError("geometry cannot be none when initializing a CUQIarray as function values (with is_par False).")
-        if is_par and (obj.ndim>1):
-            raise ValueError("input_array cannot be multidimensional when initializing CUQIarray as parameter (with is_par True).")
-        if geometry is None:
-            geometry = _DefaultGeometry(grid=obj.__len__())
-        obj.geometry = geometry
-        # Finally, we must return the newly created object:
-        return obj
-
-    def __array_finalize__(self, obj):
-        # see InfoArray.__array_finalize__ for comments
-        if obj is None: return
-        self.is_par = getattr(obj, 'is_par', True)
-        self.geometry = getattr(obj, 'geometry', None)
-
-    @property
-    def funvals(self):
-        if self.is_par is True:
-            vals = self.geometry.par2fun(self)
-        else:
-            vals = self
-
-        if isinstance(vals, np.ndarray):
-            if vals.dtype == np.dtype('O'):
-                # if vals is of type np.ndarray, but the data type of the array
-                # is object (e.g. FEniCS function), then extract the object and
-                # return it. reshape(1) is needed to convert the shape from
-                # () to (1,).
-                return self.reshape(1)[0]
-            else:
-                # else, cast the np.ndarray to a CUQIarray
-                return type(self)(vals,is_par=False,geometry=self.geometry) #vals.view(np.ndarray)
-        else:
-            return vals 
-
-    @property
-    def parameters(self):
-        if self.is_par is False:
-            vals = self.geometry.fun2par(self)
-        else:
-            vals = self
-        return type(self)(vals,is_par=True,geometry=self.geometry)
-
-    def to_numpy(self):
-        """Return a numpy array of the CUQIarray data. If is_par is True, then 
-        the parameters are returned as numpy.ndarray. If is_par is False, then 
-        the function values are returned instead.
-        """
-        try:
-            return self.view(np.ndarray)
-        except:
-            raise ValueError(
-                f"Cannot convert {self.__class__.__name__} to numpy array")
-
-    def plot(self, plot_par=False, **kwargs):
-        if plot_par:
-            kwargs["is_par"]=True
-            return self.geometry.plot(self.parameters, plot_par=plot_par, **kwargs)
-        else:
-            kwargs["is_par"]=False
-            return self.geometry.plot(self.funvals, **kwargs)
-
-
-class Data(object):
-    """
-    An container type object to represent data objects equipped with geometry.
-    """
-
-    def __init__(self, parameters=None, geometry=None, funvals=None):
-        
-        # Allow setting either parameter or function values, but not both.
-        # If both provided, function values take precedence (to be confirmed).
-        if parameters is not None and funvals is not None:
-            parameters = None
-        
-        if parameters is not None:
-            self.parameters = parameters
-        
-        if funvals is not None:
-            self.funvals = funvals
-
-        self.geometry = geometry
-        
-    def plot(self, plot_par=False, **kwargs):
-        if plot_par:
-            self.geometry.plot(self.parameters, plot_par=plot_par, is_par=True, **kwargs)
-        else:
-            self.geometry.plot(self.funvals, is_par=False, **kwargs)
-    
-    @property
-    def parameters(self):
-        return self._parameters
-    
-    @parameters.setter
-    def parameters(self, value):
-        self._parameters = value
-        self.has_parameters = True
-        self.has_funvals = False
-    
-    @property
-    def funvals(self):
-        if self.has_funvals:
-            return self._funvals
-        else:
-            return self.geometry.par2fun(self.parameters)
-    
-    @funvals.setter
-    def funvals(self, value):
-        self.has_funvals = True
-        self.has_parameters = False
-        self._funvals = value
-
-
 class Samples(object):
     """
     An object used to store samples from distributions. 

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/solver/_solver.py

@@ -4,7 +4,7 @@ from scipy.optimize import fmin_l_bfgs_b, least_squares
 import scipy.optimize as opt
 import scipy.sparse as spa
 
-from cuqi.samples import CUQIarray
+from cuqi.array import CUQIarray
 from cuqi import config
 eps = np.finfo(float).eps
 
@@ -564,4 +564,4 @@ class LM(object):
 class PDHG(object):
     """Primal-Dual Hybrid Gradient algorithm."""
     def __init__(self):
-        raise NotImplementedError
+        raise NotImplementedError

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/testproblem/_testproblem.py

@@ -10,10 +10,11 @@ from cuqi.model import LinearModel
 from cuqi.distribution import Gaussian
 from cuqi.problem import BayesianProblem
 from cuqi.geometry import Geometry, MappedGeometry, StepExpansion, KLExpansion, KLExpansion_Full, CustomKL, Continuous1D, Continuous2D, Image2D
-from cuqi.samples import CUQIarray
+from cuqi.array import CUQIarray
 import warnings
 
 
+
 #=============================================================================
 class _Deblur(BayesianProblem):
     """

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/cuqi/utilities/_utilities.py

@@ -1,4 +1,4 @@
-from cuqi.samples import CUQIarray
+from cuqi.array import CUQIarray
 import numpy as np
 import inspect
 from numbers import Number

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/tests/test_geometry.py

@@ -164,7 +164,7 @@ def test_stepExpansion_fun2par(projection, func):
     SE_geom = cuqi.geometry.StepExpansion(grid, n_steps=n_steps, fun2par_projection=projection)
     
     # Create cuqi array of function values
-    qa_f = cuqi.samples.CUQIarray(np.random.rand(len(grid)), is_par=False, geometry = SE_geom)
+    qa_f = cuqi.array.CUQIarray(np.random.rand(len(grid)), is_par=False, geometry = SE_geom)
     
     # Compute projection manually (function value to parameters)
     p = np.empty(n_steps)

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/tests/test_model.py

@@ -1,4 +1,4 @@
-from cuqi.samples import CUQIarray
+from cuqi.array import CUQIarray
 from cuqi.geometry import Continuous1D
 import numpy as np
 import scipy as sp
@@ -61,9 +61,9 @@ def test_model_allow_DefaultGeometry():
                                                [5, 2, 6]]).T),
                            cuqi.samples.Samples),
 
-                          (cuqi.samples.CUQIarray(np.array([1, 3, 4]),
+                          (cuqi.array.CUQIarray(np.array([1, 3, 4]),
                             geometry=cuqi.geometry.Continuous1D(3)),
-                           cuqi.samples.CUQIarray)])
+                           cuqi.array.CUQIarray)])
 def test_forward(x, expected_type):
     """For different types of input to the model forward method, assert we are obtaining the correct output type"""
     A = np.array([[1, 0, 0],[0, 3, .1]])
@@ -86,9 +86,9 @@ def test_forward(x, expected_type):
                                                [5, 2]])),                
                            cuqi.samples.Samples),
 
-                          (cuqi.samples.CUQIarray(np.array([1, 3]),
+                          (cuqi.array.CUQIarray(np.array([1, 3]),
                             geometry=cuqi.geometry.Continuous1D(2)),
-                           cuqi.samples.CUQIarray)])
+                           cuqi.array.CUQIarray)])
 def test_adjoint(x, expected_type):
     """For different types of input to the model adjoint method, assert we are obtaining the correct output type"""
     A = np.array([[1, 0, 0],[0, 3, .1]])
@@ -109,9 +109,9 @@ def test_adjoint(x, expected_type):
                                                [2, 6]]).T),
                            cuqi.samples.Samples),
 
-                          (cuqi.samples.CUQIarray(np.array([3, 4]),
+                          (cuqi.array.CUQIarray(np.array([3, 4]),
                             geometry=cuqi.geometry.Continuous1D(2)),
-                           cuqi.samples.CUQIarray)])
+                           cuqi.array.CUQIarray)])
 def test_gradient(direction, expected_type):
     """For different types of input to the model gradient method, assert we are obtaining the correct output type"""
     A = np.array([[1, 0, 0],[0, 3, .1]])
@@ -246,7 +246,7 @@ def test_gradient_raised_errors(wrt, is_wrt_par, case_id):
                                  lambda direction, x: np.diag(
                                      np.cos(x))@direction,
                                  np.array([1, 1, 4]),
-                                 cuqi.samples.CUQIarray(
+                                 cuqi.array.CUQIarray(
                                      np.array([1, 12**2, 8**2]), is_par=False, geometry=Continuous1D(3)), # Geometry will be updated
                                  cuqi.geometry.MappedGeometry(Continuous1D(
                                      3), map=lambda x:x**2, imap=lambda x:np.sqrt(x)),
@@ -272,7 +272,7 @@ def test_gradient_raised_errors(wrt, is_wrt_par, case_id):
                                  lambda x: np.sin(x),
                                  lambda direction, x: np.diag(
                                      np.cos(x))@direction,
-                                 cuqi.samples.CUQIarray(
+                                 cuqi.array.CUQIarray(
                                      np.array([1, 1, 4]), is_par=False, geometry=Continuous1D(3)), # Geometry will be updated
                                  np.array([1, 12, 8]),
                                  cuqi.geometry.MappedGeometry(Continuous1D(

{CUQIpy-0.2.0.post0.dev116 → CUQIpy-0.3.0}/tests/test_samples.py

@@ -272,19 +272,19 @@ def test_parameters_property(geom, map, imap, supported):
 
 def test_cuqiarray_default_geometry():
     """ Test that CUQIarray creates a default geometry when no geometry is passed"""
-    v = cuqi.samples.CUQIarray([0,1,2,3,4,5,6,7,8])
+    v = cuqi.array.CUQIarray([0,1,2,3,4,5,6,7,8])
     assert type(v.geometry) is cuqi.geometry._geometry._DefaultGeometry
 
 def test_cuqiarray_multidim():
     X = np.array([[1, 2], [3,4]])
     with pytest.raises(Exception) as e:
-        C = cuqi.samples.CUQIarray(X)
+        C = cuqi.array.CUQIarray(X)
     assert "input_array cannot be multidimensional when initializing CUQIarray as parameter (with is_par True)." in str(e.value) # this message
     assert e.type == ValueError  
 
 def test_cuqiarray_ispar_false_without_geometry():
     with pytest.raises(Exception) as e:
-        X = cuqi.samples.CUQIarray([1,2,3], is_par=False)
+        X = cuqi.array.CUQIarray([1,2,3], is_par=False)
     assert "geometry cannot be none when initializing a CUQIarray as function values (with is_par False)." in str(e.value) # this message
     assert e.type == ValueError   
 

CUQIpy-0.2.0.post0.dev116/cuqi/samples/__init__.py

@@ -1 +0,0 @@
-from ._samples import CUQIarray, Samples, Data