CUQIpy 1.1.0.post0.dev17__py3-none-any.whl → 1.1.0.post0.dev21__py3-none-any.whl

{CUQIpy-1.1.0.post0.dev17.dist-info → CUQIpy-1.1.0.post0.dev21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CUQIpy
-Version: 1.1.0.post0.dev17
+Version: 1.1.0.post0.dev21
 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>, Chao Zhang <chaz@dtu.dk>
 License: Apache License

{CUQIpy-1.1.0.post0.dev17.dist-info → CUQIpy-1.1.0.post0.dev21.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cuqi/__init__.py,sha256=LsGilhl-hBLEn6Glt8S_l0OJzAA1sKit_rui8h-D-p0,488
 cuqi/_messages.py,sha256=fzEBrZT2kbmfecBBPm7spVu7yHdxGARQB4QzXhJbCJ0,415
-cuqi/_version.py,sha256=0JqlX-Uo--FUa91E6xcFA4Juiov_j5hkWtMvkSXhjGU,509
+cuqi/_version.py,sha256=pquuWWNWYDJTUFSDbH_S09M9kXQmP_DnjYFj4pEcm7k,509
 cuqi/config.py,sha256=wcYvz19wkeKW2EKCGIKJiTpWt5kdaxyt4imyRkvtTRA,526
 cuqi/diagnostics.py,sha256=5OrbJeqpynqRXOe5MtOKKhe7EAVdOEpHIqHnlMW9G_c,3029
 cuqi/array/__init__.py,sha256=-EeiaiWGNsE3twRS4dD814BIlfxEsNkTCZUc5gjOXb0,30
@@ -37,16 +37,16 @@ cuqi/experimental/__init__.py,sha256=vhZvyMX6rl8Y0haqCzGLPz6PSUKyu75XMQbeDHqTTrw
 cuqi/experimental/mcmc/__init__.py,sha256=8Ce1mHvfbKPe0A5gCDl5Bj4ok8bvbn90LEDvfePfNT4,536
 cuqi/experimental/mcmc/_conjugate.py,sha256=VNPQkGity0mposcqxrx4UIeXm35EvJvZED4p2stffvA,9924
 cuqi/experimental/mcmc/_conjugate_approx.py,sha256=uEnY2ea9su5ivcNagyRAwpQP2gBY98sXU7N0y5hTADo,3653
-cuqi/experimental/mcmc/_cwmh.py,sha256=VoSTfdDbKKLKb5XyOq8xplrrGTK-8IQESdQDZ8PFp2I,7121
+cuqi/experimental/mcmc/_cwmh.py,sha256=BQE7-4kbiC32TJ38rlVtfSQieoKBK5GDca3HCqHJ7zE,7135
 cuqi/experimental/mcmc/_direct.py,sha256=9pQS_2Qk2-ybt6m8WTfPoKetcxQ00WaTRN85-Z0FrBY,777
-cuqi/experimental/mcmc/_gibbs.py,sha256=tMrAy1c_d9G9fOrr8SvuDVCSKjWrYvnI8znPM3GBPqc,10608
+cuqi/experimental/mcmc/_gibbs.py,sha256=IxZLDeRGZUhZMDCRyDoII67kcuClIeJoMoYKoICAaSU,10619
 cuqi/experimental/mcmc/_hmc.py,sha256=h63KT0jYq86H541hQzhHHzuLEn7vrRE_2r1o1mTEcZo,19261
 cuqi/experimental/mcmc/_langevin_algorithm.py,sha256=GKC_mlix3si_3J8E6I58ozh3ErB0XPmHMjV7sFyKLEQ,8200
-cuqi/experimental/mcmc/_laplace_approximation.py,sha256=4vRc0h7iLrbs2UrptQN5SDAaAq-RpXlnx569OqHmmuE,5698
-cuqi/experimental/mcmc/_mh.py,sha256=7KpM7RFVDQ13SD3uGStPJAHZdsX5mO_fzJLkXK90YgI,2827
+cuqi/experimental/mcmc/_laplace_approximation.py,sha256=rdiE3cMQFq6FLQcOQwPpuGIxrTAp3aoGPxMDSdeopV0,5688
+cuqi/experimental/mcmc/_mh.py,sha256=W5hOraHqfEW4_havtC9Ib2SinJtNV-NvxcOAENeTYUY,2841
 cuqi/experimental/mcmc/_pcn.py,sha256=wqJBZLuRFSwxihaI53tumAg6AWVuceLMOmXssTetd1A,3374
-cuqi/experimental/mcmc/_rto.py,sha256=P1AV1tgnRMXLatkayb2O-OiE5Cta3S_yA9arSAoBkdw,10071
-cuqi/experimental/mcmc/_sampler.py,sha256=6BRq3cQFG-NjUpHWpLA7EisX0Vjxu4MhpWA6Z1nFpos,20049
+cuqi/experimental/mcmc/_rto.py,sha256=OtzgiYCxDoTdXp7y4mkLa2upj74qadesoqHYpr11ZCg,10061
+cuqi/experimental/mcmc/_sampler.py,sha256=_ZE0kJZYlo8heolAA0rTgO1sQZ7uwV-lNqCYHxnihFk,20067
 cuqi/experimental/mcmc/_utilities.py,sha256=kUzHbhIS3HYZRbneNBK41IogUYX5dS_bJxqEGm7TQBI,525
 cuqi/geometry/__init__.py,sha256=Tz1WGzZBY-QGH3c0GiyKm9XHN8MGGcnU6TUHLZkzB3o,842
 cuqi/geometry/_geometry.py,sha256=WYFC-4_VBTW73b2ldsnfGYKvdSiCE8plr89xTSmkadg,46804
@@ -85,8 +85,8 @@ cuqi/testproblem/_testproblem.py,sha256=x769LwwRdJdzIiZkcQUGb_5-vynNTNALXWKato7s
 cuqi/utilities/__init__.py,sha256=T4tLsC215MknBCsw_C0Qeeg_ox26aDUrCA5hbWvNQkU,387
 cuqi/utilities/_get_python_variable_name.py,sha256=QwlBVj2koJRA8s8pWd554p7-ElcI7HUwY32HknaR92E,1827
 cuqi/utilities/_utilities.py,sha256=MWAqV6L5btMpWwlUzrZYuV2VeSpfTbOaLRMRkuw2WIA,8509
-CUQIpy-1.1.0.post0.dev17.dist-info/LICENSE,sha256=kJWRPrtRoQoZGXyyvu50Uc91X6_0XRaVfT0YZssicys,10799
-CUQIpy-1.1.0.post0.dev17.dist-info/METADATA,sha256=9lP1DqQtrxElm70ikrRckkrZcZaYvtiZ_XatVM0KE2w,18390
-CUQIpy-1.1.0.post0.dev17.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-CUQIpy-1.1.0.post0.dev17.dist-info/top_level.txt,sha256=AgmgMc6TKfPPqbjV0kvAoCBN334i_Lwwojc7HE3ZwD0,5
-CUQIpy-1.1.0.post0.dev17.dist-info/RECORD,,
+CUQIpy-1.1.0.post0.dev21.dist-info/LICENSE,sha256=kJWRPrtRoQoZGXyyvu50Uc91X6_0XRaVfT0YZssicys,10799
+CUQIpy-1.1.0.post0.dev21.dist-info/METADATA,sha256=rMz9rRNyTGpXZ9HSCjmlmKmZhBx4tp6oGXGT94UIdxE,18390
+CUQIpy-1.1.0.post0.dev21.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+CUQIpy-1.1.0.post0.dev21.dist-info/top_level.txt,sha256=AgmgMc6TKfPPqbjV0kvAoCBN334i_Lwwojc7HE3ZwD0,5
+CUQIpy-1.1.0.post0.dev21.dist-info/RECORD,,

cuqi/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-08-26T08:07:58+0200",
+ "date": "2024-08-26T11:10:44+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "9d87eb837ab12ccedf61101e396df2ab1cb37764",
- "version": "1.1.0.post0.dev17"
+ "full-revisionid": "d8a5799ec1e1e581a09e032cbf01bd3eab1b960d",
+ "version": "1.1.0.post0.dev21"
 }
 '''  # END VERSION_JSON
 

cuqi/experimental/mcmc/_cwmh.py

@@ -101,7 +101,7 @@ class CWMH(ProposalBasedSampler):
                 "Target should be an instance of "+\
                 f"{cuqi.density.Density.__class__.__name__}")
         # Fail when there is no log density, which is currently assumed to be the case in case NaN is returned.
-        if np.isnan(self.target.logd(self._default_initial_point)):
+        if np.isnan(self.target.logd(self._get_default_initial_point(self.dim))):
             raise ValueError("Target does not have valid logd")
         
     def validate_proposal(self):

cuqi/experimental/mcmc/_gibbs.py

@@ -255,10 +255,11 @@ class HybridGibbs:
         """ Get initial points for each parameter """
         initial_points = {}
         for par_name in self.par_names:
-            if hasattr(self.target.get_density(par_name), 'init_point'):
-                initial_points[par_name] = self.target.get_density(par_name).init_point
-            else:
-                initial_points[par_name] = np.ones(self.target.get_density(par_name).dim)
+            sampler = self.samplers[par_name]
+            if sampler.initial_point is None:
+                sampler.initial_point = sampler._get_default_initial_point(self.target.get_density(par_name).dim)
+            initial_points[par_name] = sampler.initial_point
+            
         return initial_points
 
     def _store_samples(self):

cuqi/experimental/mcmc/_laplace_approximation.py

@@ -151,7 +151,6 @@ class UGLA(Sampler):
         if not isinstance(self.prior, cuqi.distribution.LMRF):
             raise ValueError('Unadjusted Gaussian Laplace approximation (UGLA) requires LMRF prior')
         
-    @property
-    def _default_initial_point(self):
+    def _get_default_initial_point(self, dim):
         """ Get the default initial point for the sampler. Defaults to an array of zeros. """
-        return np.zeros(self.dim)
+        return np.zeros(dim)

cuqi/experimental/mcmc/_mh.py

@@ -33,7 +33,7 @@ class MH(ProposalBasedSampler):
 
     def validate_target(self):
         # Fail only when there is no log density, which is currently assumed to be the case in case NaN is returned.
-        if np.isnan(self.target.logd(self._default_initial_point)):
+        if np.isnan(self.target.logd(self._get_default_initial_point(self.dim))):
             raise ValueError("Target does not have valid logd")
 
     def validate_proposal(self):

cuqi/experimental/mcmc/_rto.py

@@ -150,10 +150,9 @@ class LinearRTO(Sampler):
         if not hasattr(self.prior, "sqrtprecTimesMean"):
             raise TypeError("Prior must contain a sqrtprecTimesMean attribute")
     
-    @property
-    def _default_initial_point(self):
+    def _get_default_initial_point(self, dim):
         """ Get the default initial point for the sampler. Defaults to an array of zeros. """
-        return np.zeros(self.dim)
+        return np.zeros(dim)
 
 class RegularizedLinearRTO(LinearRTO):
     """

cuqi/experimental/mcmc/_sampler.py

@@ -80,7 +80,7 @@ class Sampler(ABC):
         
         # Default values
         if self.initial_point is None:
-            self.initial_point = self._default_initial_point
+            self.initial_point = self._get_default_initial_point(self.dim)
 
         # State variables
         self.current_point = self.initial_point
@@ -386,10 +386,9 @@ class Sampler(ABC):
         if not self._is_initialized:
             self.initialize()
             
-    @property
-    def _default_initial_point(self):
+    def _get_default_initial_point(self, dim):
         """ Return the default initial point for the sampler. Defaults to an array of ones. """
-        return np.ones(self.dim)
+        return np.ones(dim)
     
     def __repr__(self):
         """ Return a string representation of the sampler. """
@@ -452,7 +451,7 @@ class ProposalBasedSampler(Sampler, ABC):
         
         # Default values
         if self.initial_point is None:
-            self.initial_point = self._default_initial_point
+            self.initial_point = self._get_default_initial_point(self.dim)
 
         if self.proposal is None:
             self.proposal = self._default_proposal