CUQIpy 1.1.1.post0.dev5__tar.gz → 1.1.1.post0.dev15__tar.gz

{cuqipy-1.1.1.post0.dev5 → cuqipy-1.1.1.post0.dev15}/CUQIpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CUQIpy
-Version: 1.1.1.post0.dev5
+Version: 1.1.1.post0.dev15
 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.1.post0.dev5 → cuqipy-1.1.1.post0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CUQIpy
-Version: 1.1.1.post0.dev5
+Version: 1.1.1.post0.dev15
 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.1.post0.dev5 → cuqipy-1.1.1.post0.dev15}/cuqi/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-08-31T21:02:04+0200",
+ "date": "2024-09-04T08:48:13+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "b38281138379969a9a8c4683ba3ecf8a88031939",
- "version": "1.1.1.post0.dev5"
+ "full-revisionid": "651202293e69ec5fa33c7da436d77d65adb562bd",
+ "version": "1.1.1.post0.dev15"
 }
 '''  # END VERSION_JSON
 

{cuqipy-1.1.1.post0.dev5 → cuqipy-1.1.1.post0.dev15}/cuqi/experimental/mcmc/_gibbs.py

@@ -6,10 +6,10 @@ import numpy as np
 import warnings
 
 try:
-    from progressbar import progressbar
+    from tqdm import tqdm
 except ImportError:
-    def progressbar(iterable, **kwargs):
-        warnings.warn("Module mcmc: Progressbar not found. Install progressbar2 to get sampling progress.")
+    def tqdm(iterable, **kwargs):
+        warnings.warn("Module mcmc: tqdm not found. Install tqdm to get sampling progress.")
         return iterable
 
 # Not subclassed from Sampler as Gibbs handles multiple samplers and samples multiple parameters
@@ -152,13 +152,13 @@ class HybridGibbs:
 
     def sample(self, Ns) -> 'HybridGibbs':
         """ Sample from the joint distribution using Gibbs sampling """
-        for _ in progressbar(range(Ns)):
+        for _ in tqdm(range(Ns)):
             self.step()
             self._store_samples()
 
     def warmup(self, Nb) -> 'HybridGibbs':
         """ Warmup (tune) the Gibbs sampler """
-        for idx in progressbar(range(Nb)):
+        for idx in tqdm(range(Nb)):
             self.step()
             self.tune(idx)
             self._store_samples()

{cuqipy-1.1.1.post0.dev5 → cuqipy-1.1.1.post0.dev15}/cuqi/experimental/mcmc/_sampler.py

@@ -7,10 +7,10 @@ import cuqi
 from cuqi.samples import Samples
 
 try:
-    from progressbar import progressbar
+    from tqdm import tqdm
 except ImportError:
-    def progressbar(iterable, **kwargs):
-        warnings.warn("Module mcmc: Progressbar not found. Install progressbar2 to get sampling progress.")
+    def tqdm(iterable, **kwargs):
+        warnings.warn("Module mcmc: tqdm not found. Install tqdm to get sampling progress.")
         return iterable
 
 class Sampler(ABC):
@@ -220,7 +220,7 @@ class Sampler(ABC):
         if hasattr(self, "_pre_sample"): self._pre_sample()
 
         # Draw samples
-        for _ in progressbar( range(Ns) ):
+        for _ in tqdm( range(Ns) ):
             
             # Perform one step of the sampler
             acc = self.step()
@@ -260,7 +260,7 @@ class Sampler(ABC):
         if hasattr(self, "_pre_warmup"): self._pre_warmup()
 
         # Draw warmup samples with tuning
-        for idx in progressbar(range(Nb)):
+        for idx in tqdm(range(Nb)):
 
             # Perform one step of the sampler
             acc = self.step()

{cuqipy-1.1.1.post0.dev5 → cuqipy-1.1.1.post0.dev15}/cuqi/geometry/_geometry.py

@@ -395,6 +395,8 @@ class Continuous1D(Continuous):
         self._grid = self._create_dimension(value)
 
     def _plot(self, values, *args, **kwargs):
+        if self.par_dim==1 and "marker" not in kwargs.keys():
+            kwargs["marker"] = "o"
         p = plt.plot(self.grid, values, *args, **kwargs)
         self._plot_config()
         return p

{cuqipy-1.1.1.post0.dev5 → cuqipy-1.1.1.post0.dev15}/tests/test_samples.py

@@ -54,6 +54,22 @@ def test_samples_plot(geom, to_funvals, plot_par):
     with pytest.raises(ValueError,match=r"Cannot pass is_par as a plotting argument"):
         s.plot(is_par=not to_funvals,plot_par=plot_par)
 
+@pytest.mark.parametrize("geom",[
+						(cuqi.geometry.Discrete(1)),
+						(cuqi.geometry.Continuous1D(1))
+						])
+@pytest.mark.parametrize("kwargs",[
+                        ({}),
+                        ({"marker":"*"}),
+                        ])
+def test_1D_samples_plot(geom, kwargs):
+    # Make basic distribution and sample
+    my_gaussian = cuqi.distribution.Gaussian(mean=1, cov=1)
+    samples = my_gaussian.sample(10)
+    samples.geometry = geom
+    fig1 = samples.plot(**kwargs)
+    fig2 = samples.plot(0, **kwargs)
+
 @pytest.mark.parametrize("to_funvals, plot_par", [(True,False),(True,True),(False,False),(False,True)])
 @pytest.mark.parametrize("plot_method, plot_par_supported, arviz",
                          [(Samples.plot_autocorrelation, False, True),