CUQIpy 1.3.0.post0.dev292__tar.gz → 1.3.0.post0.dev298__tar.gz

{cuqipy-1.3.0.post0.dev292 → cuqipy-1.3.0.post0.dev298}/CUQIpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CUQIpy
-Version: 1.3.0.post0.dev292
+Version: 1.3.0.post0.dev298
 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.3.0.post0.dev292 → cuqipy-1.3.0.post0.dev298}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CUQIpy
-Version: 1.3.0.post0.dev292
+Version: 1.3.0.post0.dev298
 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.3.0.post0.dev292 → cuqipy-1.3.0.post0.dev298}/cuqi/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-07-04T09:41:59+0300",
+ "date": "2025-09-04T09:48:37+0300",
  "dirty": false,
  "error": null,
- "full-revisionid": "7536b0d728d704a7ab46bca7ff4756075ba0e573",
- "version": "1.3.0.post0.dev292"
+ "full-revisionid": "a0d227d0981362a09d24dc976ad65459ba8bf798",
+ "version": "1.3.0.post0.dev298"
 }
 '''  # END VERSION_JSON
 

{cuqipy-1.3.0.post0.dev292 → cuqipy-1.3.0.post0.dev298}/cuqi/distribution/_joint_distribution.py

@@ -283,7 +283,7 @@ class JointDistribution:
             msg += f"\t{density.name} ~ {density}\n"
 
         # Wrap up
-        msg += ")"
+        msg += " )"
 
         return msg
 

{cuqipy-1.3.0.post0.dev292 → cuqipy-1.3.0.post0.dev298}/cuqi/experimental/_recommender.py

@@ -17,6 +17,24 @@ class SamplerRecommender(object):
 
     exceptions: list[cuqi.experimental.mcmc.Sampler], *optional*
         Samplers not to be recommended.
+    
+    Example
+    -------
+    .. code-block:: python
+        import numpy as np
+        from cuqi.distribution import Gamma, Gaussian, JointDistribution
+        from cuqi.experimental import SamplerRecommender
+
+        x = Gamma(1, 1)
+        y = Gaussian(np.zeros(2), cov=lambda x: 1 / x)
+        target = JointDistribution(y, x)(y=1)
+
+        recommender = SamplerRecommender(target)
+        valid_samplers = recommender.valid_samplers()
+        recommended_sampler = recommender.recommend()
+        print("Valid samplers:", valid_samplers)
+        print("Recommended sampler:\n", recommended_sampler)
+
     """
 
     def __init__(self, target:cuqi.density.Density, exceptions = []):
@@ -28,7 +46,7 @@ class SamplerRecommender(object):
     def target(self) -> cuqi.density.Density:
         """ Return the target Distribution. """
         return self._target
-    
+
     @target.setter
     def target(self, value:cuqi.density.Density):
         """ Set the target Distribution. Runs validation of the target. """
@@ -73,7 +91,7 @@ class SamplerRecommender(object):
     def ordering(self):
         """ Returns the ordered list of recommendation rules used by the recommender. """
         return self._ordering
-    
+
     def valid_samplers(self, as_string = True):
         """
         Finds all possible samplers that can be used for sampling from the target distribution.
@@ -101,7 +119,6 @@ class SamplerRecommender(object):
             valid_samplers += [cuqi.experimental.mcmc.HybridGibbs.__name__ if as_string else cuqi.experimental.mcmc.HybridGibbs]
 
         return valid_samplers
-    
 
     def valid_HybridGibbs_sampling_strategy(self, as_string = True):
         """
@@ -131,11 +148,10 @@ class SamplerRecommender(object):
             samplers = recommender.valid_samplers(as_string)
             if len(samplers) == 0:
                 return None
-            
+
             valid_samplers[par_name] = samplers
 
         return valid_samplers
-    
 
     def recommend(self, as_string = False):
         """
@@ -194,7 +210,7 @@ class SamplerRecommender(object):
 
             if sampler is None:
                 return None
-            
+
             suggested_samplers[par_name] = sampler
 
-        return suggested_samplers
+        return suggested_samplers

{cuqipy-1.3.0.post0.dev292 → cuqipy-1.3.0.post0.dev298}/cuqi/experimental/mcmc/_gibbs.py

@@ -359,3 +359,16 @@ class HybridGibbs:
         """ Store current samples at index i of samples dict """
         for par_name in self.par_names:
             self.samples[par_name].append(self.current_samples[par_name])
+
+    def __repr__(self):
+        """ Return a string representation of the sampler. """
+        msg = f"Sampler: {self.__class__.__name__} \n"
+        if self.target is None:
+            msg += f" Target: None \n"
+        else:
+            msg += f" Target: \n \t {self.target} \n\n"
+            
+        for key, value in zip(self.samplers.keys(), self.samplers.values()):
+            msg += f" Variable '{key}' with {value} \n"
+
+        return msg