CUQIpy 1.1.0.post0.dev17__tar.gz → 1.1.0.post0.dev21__tar.gz

{cuqipy-1.1.0.post0.dev17 → cuqipy-1.1.0.post0.dev21}/CUQIpy.egg-info/PKG-INFO

@@ -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 → cuqipy-1.1.0.post0.dev21}/PKG-INFO

@@ -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 → cuqipy-1.1.0.post0.dev21}/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
 

{cuqipy-1.1.0.post0.dev17 → cuqipy-1.1.0.post0.dev21}/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):

{cuqipy-1.1.0.post0.dev17 → cuqipy-1.1.0.post0.dev21}/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):

{cuqipy-1.1.0.post0.dev17 → cuqipy-1.1.0.post0.dev21}/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)

{cuqipy-1.1.0.post0.dev17 → cuqipy-1.1.0.post0.dev21}/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):

{cuqipy-1.1.0.post0.dev17 → cuqipy-1.1.0.post0.dev21}/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):
     """

{cuqipy-1.1.0.post0.dev17 → cuqipy-1.1.0.post0.dev21}/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