CUQIpy 0.2.0.post0.dev116__py3-none-any.whl → 0.3.0__py3-none-any.whl

{CUQIpy-0.2.0.post0.dev116.dist-info → CUQIpy-0.3.0.dist-info}/METADATA

@@ -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.dist-info → CUQIpy-0.3.0.dist-info}/RECORD

@@ -1,8 +1,10 @@
-cuqi/__init__.py,sha256=rgJFSXHzrZVL95CCUjgm5dmkCaG6xrnp0fS-4edSKnc,413
+cuqi/__init__.py,sha256=K0ss2HNqoLUX7wGpSZdaPKxIaKdRS452fcJm4D0pcEs,433
 cuqi/_messages.py,sha256=fzEBrZT2kbmfecBBPm7spVu7yHdxGARQB4QzXhJbCJ0,415
-cuqi/_version.py,sha256=SNjEw5IPKfnKQGBCskGB4jWsZDXL2xTa402h6cL-sdI,510
+cuqi/_version.py,sha256=1VECjRV5lN0Bx-UB6WKu0FNCJQAq7St7aI6zsiVNhvU,497
 cuqi/config.py,sha256=wcYvz19wkeKW2EKCGIKJiTpWt5kdaxyt4imyRkvtTRA,526
 cuqi/diagnostics.py,sha256=5OrbJeqpynqRXOe5MtOKKhe7EAVdOEpHIqHnlMW9G_c,3029
+cuqi/array/__init__.py,sha256=-EeiaiWGNsE3twRS4dD814BIlfxEsNkTCZUc5gjOXb0,30
+cuqi/array/_array.py,sha256=s2dGA-MyrPhCqT4E0-nnglLmYL1HhbBYvhPdgC8RdFc,3968
 cuqi/data/__init__.py,sha256=EtM27CtziMif8yWpxMNoqwmvIOAhnNBjTd25H8oh9m0,161
 cuqi/data/_data.py,sha256=ou2CvDqp_HDtW8XXEQUGf5ptoAdPGwrAXubI8A9KRkM,9276
 cuqi/data/astronaut.npz,sha256=vVTb6eJLMZhrEZuOYzQWN3V2EhhVH6sHzrrf_7mstcw,786696
@@ -15,7 +17,7 @@ cuqi/distribution/__init__.py,sha256=kvEzw1EOF38GnviUv4Bq8l3IZshXvwZEqNKgdN9YHEk
 cuqi/distribution/_beta.py,sha256=xQ6nURJqB20j1A8YNnpKO9BUcb-kKUdq8QCmljlm9l4,2980
 cuqi/distribution/_cauchy_diff.py,sha256=Ka8KgnBGz7CrJL9n7pNp3aOKfZ7sxbGP8dvxzBHo5Yw,3672
 cuqi/distribution/_custom.py,sha256=-HcuBFfudA6Ntt0Vs6cixJs3vJngpOiK2hmj0Q8ozK0,10488
-cuqi/distribution/_distribution.py,sha256=2kdwzmvee1b8JsJEJUPRLUm38R6KU2pMpfXZCuwB9XQ,15851
+cuqi/distribution/_distribution.py,sha256=8Nttupt-8kp03uiZad-IBQXqnhWRXVO4yL4xEp9sKsI,15873
 cuqi/distribution/_gamma.py,sha256=GGsbIeHQhzUb1eTNeARcLXjJqcZ5iZWvaDaNsfJv9N0,1303
 cuqi/distribution/_gaussian.py,sha256=3Lvpl_ErUpQB07AVHybdjo4IH9pUjG7dPjKq4MveBao,32588
 cuqi/distribution/_gmrf.py,sha256=2SUIEFqIkEhHLJ7oSsWXXPMIeeTBkFkGm6rFcmehJDg,10382
@@ -31,15 +33,15 @@ cuqi/distribution/_uniform.py,sha256=7xJmCZH_LPhuGkwEDGh-_CTtzcWKrXMOxtTJUFb7Ydo
 cuqi/geometry/__init__.py,sha256=2vypOJ-vRIZtbgUS1a57XSjOJq2vu11x_E5MFaE9Xm0,772
 cuqi/geometry/_geometry.py,sha256=kmzDaNqSr1WjoGo5B1TlOY2YCLOJrSzaMiT0Wc2qZI8,39613
 cuqi/likelihood/__init__.py,sha256=ZUuc7ysBoFvx-L_IKetlKgqht9k8x4kMA_iQA0yuQFM,1774
-cuqi/likelihood/_likelihood.py,sha256=f2CLzkr2Cp2SfMoHFU8-WXs5V_6pz6gtSkD4HHDsahw,6553
+cuqi/likelihood/_likelihood.py,sha256=_eY3kKcviV7klOALGRAjVKhh1BcbhjyP4qPAJXsaJoM,6551
 cuqi/model/__init__.py,sha256=IcN4aZCnyp9o-8TNIoZ8vew99QQgi0EmZvnsIuR6qYI,49
-cuqi/model/_model.py,sha256=ywCTO2UulsYWJ3yF3iRVMPcnDOaB6roV_KQCgOaADKk,21525
+cuqi/model/_model.py,sha256=F0_X_ZHN-GQ9Sp7HCPy8O0BsLn4epPVh9Ns_IRadeEs,21525
 cuqi/operator/__init__.py,sha256=0pc9p-KPyl7KtPV0noB0ddI0CP2iYEHw5rbw49D8Njk,136
 cuqi/operator/_operator.py,sha256=yNwPTh7jR07AiKMbMQQ5_54EgirlKFsbq9JN1EODaQI,8856
 cuqi/pde/__init__.py,sha256=NyS_ZYruCvy-Yg24qKlwm3ZIX058kLNQX9bqs-xg4ZM,99
 cuqi/pde/_pde.py,sha256=wWKwLCLQfJMcpelW0VC5S265dR8RAJEHkKKRs7Ss5rI,10337
 cuqi/problem/__init__.py,sha256=JxJty4JqHTOqSG6NeTGiXRQ7OLxiRK9jvVq3lXLeIRw,38
-cuqi/problem/_problem.py,sha256=KaxiWY5Og8e4SdQcYwSMre9MKzuSYj2jn_JUxtWov_8,29079
+cuqi/problem/_problem.py,sha256=wWjY4aoCXP8iYiiMerpIDVUorVk2iOfPrmcukAXHvmk,29073
 cuqi/sampler/__init__.py,sha256=G2j-yknEfY-GYqCea3MRQbKBTGdRCpcgEhajtSvmn2Q,403
 cuqi/sampler/_conjugate.py,sha256=Ip3HM12j8Bq9T0925N007_o-2xrKsn6q-KMf6vqYPVs,1514
 cuqi/sampler/_conjugate_approx.py,sha256=n8kN-EQCYXAjBPEOFOjDcIqTn-zYCaGcKy30R4o-opI,1970
@@ -52,17 +54,17 @@ cuqi/sampler/_mh.py,sha256=34sgy_GHwTgtmO4tFJv_c0ujMPNj_8MveFlI0tCP6a0,7094
 cuqi/sampler/_pcn.py,sha256=0dqf-YjmEzswHJGNgneyEpMpmHZxwVGUpeiqLvQybxU,8602
 cuqi/sampler/_rto.py,sha256=kqNj3aEE0b-ZSU2gs3XOJSFrespETqH34DLEnllDV0Q,6158
 cuqi/sampler/_sampler.py,sha256=ar_DcGnvu7y4XWOkdqduBJTGvCtWzibVm2fKReWRE8Y,5709
-cuqi/samples/__init__.py,sha256=a1XXucotE84BqKTlDbXDFSznb7AcUCA1wERT_wUMAPY,47
-cuqi/samples/_samples.py,sha256=IE5ZCt-y1bISlJQ3OB2Lg4eZk6isc7Z-4DCeqkciYxc,31100
+cuqi/samples/__init__.py,sha256=E7B9IBUsiOBr-HAKH9o3_Lqhq4KeWO87hmesHkdbwTY,30
+cuqi/samples/_samples.py,sha256=b2XLSjVFPgjzXxWUn7ggqCIULsYH3xQBJvEUiddL790,25759
 cuqi/solver/__init__.py,sha256=K3FwAG9Z0t2893Vn50SvTmjhxy5C1whroNspyf2Xm4M,102
-cuqi/solver/_solver.py,sha256=hn9KUxgAauTXdk8PM0jUWgDdAexYibwSfvS10HQKuq4,19378
+cuqi/solver/_solver.py,sha256=89K3aAmAWL9WBtZCOexkx6b141xQaUDu7_bvpdH-8f8,19377
 cuqi/testproblem/__init__.py,sha256=jcBGNZR3n7iJkoWmm-5zm5SDDt2UVrx8nbBV31hqH-o,205
-cuqi/testproblem/_testproblem.py,sha256=-d-KLv9PS_QI-uxzH3GEiJ562gKfJTISU6lPLiHMiTg,52311
+cuqi/testproblem/_testproblem.py,sha256=9ZZl1Q007ZpHFTWrpk9MDymWLkAderZhkRbJOLHUkiM,52310
 cuqi/utilities/__init__.py,sha256=EfxHLdsyDNugbmbzs43nV_AeKcycM9sVBjG9WZydagA,351
 cuqi/utilities/_get_python_variable_name.py,sha256=QwlBVj2koJRA8s8pWd554p7-ElcI7HUwY32HknaR92E,1827
-cuqi/utilities/_utilities.py,sha256=qJhqhD4kYxgtuHM8uykxf-IxIE_W5ZHht2yij1Z4P4k,7975
-CUQIpy-0.2.0.post0.dev116.dist-info/LICENSE,sha256=kJWRPrtRoQoZGXyyvu50Uc91X6_0XRaVfT0YZssicys,10799
-CUQIpy-0.2.0.post0.dev116.dist-info/METADATA,sha256=TUC32pKap7AQknBo9T_lfE9Grndv3nAdVgqRCbmp1Ys,16480
-CUQIpy-0.2.0.post0.dev116.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-CUQIpy-0.2.0.post0.dev116.dist-info/top_level.txt,sha256=AgmgMc6TKfPPqbjV0kvAoCBN334i_Lwwojc7HE3ZwD0,5
-CUQIpy-0.2.0.post0.dev116.dist-info/RECORD,,
+cuqi/utilities/_utilities.py,sha256=rjycaxDWExdskIfYXV1z5ZlB0JTlqv3tCmKf08i6U5c,7973
+CUQIpy-0.3.0.dist-info/LICENSE,sha256=kJWRPrtRoQoZGXyyvu50Uc91X6_0XRaVfT0YZssicys,10799
+CUQIpy-0.3.0.dist-info/METADATA,sha256=RR3_xhUO4mqnzJS8UOKLaXmka4Pbwuf-mMcS-HHpVLE,16467
+CUQIpy-0.3.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+CUQIpy-0.3.0.dist-info/top_level.txt,sha256=AgmgMc6TKfPPqbjV0kvAoCBN334i_Lwwojc7HE3ZwD0,5
+CUQIpy-0.3.0.dist-info/RECORD,,

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

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
 

cuqi/array/__init__.py

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

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)

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

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.
 
     """

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,

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
 

cuqi/samples/__init__.py

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

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. 

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

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):
     """

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