pathsim 0.29.0__tar.gz → 0.29.2__tar.gz

{pathsim-0.29.0 → pathsim-0.29.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pathsim
-Version: 0.29.0
+Version: 0.29.2
 Summary: A differentiable block based hybrid system simulation framework.
 Author-email: Milan Rother <milan.rother@gmx.de>
 License: MIT

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.29.0'
-__version_tuple__ = version_tuple = (0, 29, 0)
+__version__ = version = '0.29.2'
+__version_tuple__ = version_tuple = (0, 29, 2)
 
-__commit_id__ = commit_id = 'g220bc787c'
+__commit_id__ = commit_id = 'gc2d44b82b'

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim/blocks/bvp.py

@@ -252,8 +252,10 @@ class BVP1D(Block):
         u = self.inputs.to_array()
 
         #skip the solve if the boundary data is unchanged since the last
-        #successful solve; the warm-start and output are still valid
+        #successful solve; the warm-start and output are still valid, also
+        #when a solve for another input failed in between
         if self._u_last is not None and np.array_equal(u, self._u_last):
+            self.success = True
             return
 
         #scipy callbacks, with or without free parameters

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim/blocks/scope.py

@@ -18,6 +18,7 @@ import matplotlib.pyplot as plt
 from ._block import Block
 from ..events.schedule import Schedule
 from ..utils.realtimeplotter import RealtimePlotter
+from ..utils.plotting import show
 from ..utils.deprecation import deprecated
 
 from .._constants import COLORS_ALL
@@ -270,7 +271,7 @@ class Scope(Block):
         fig.canvas.mpl_connect("pick_event", on_pick)
 
         #show the plot without blocking following code
-        plt.show(block=False)
+        show(fig)
 
         #return figure and axis for outside manipulation
         return fig, ax
@@ -337,7 +338,7 @@ class Scope(Block):
         ax.grid()
 
         #show the plot without blocking following code
-        plt.show(block=False)
+        show(fig)
 
         #return figure and axis for outside manipulation
         return fig, ax
@@ -408,7 +409,7 @@ class Scope(Block):
         ax.set_zlabel(label3)
 
         #show the plot without blocking
-        plt.show(block=False)
+        show(fig)
 
         return fig, ax
 

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim/blocks/spectrum.py

@@ -14,6 +14,7 @@ import matplotlib.pyplot as plt
 from ._block import Block
 
 from ..utils.realtimeplotter import RealtimePlotter
+from ..utils.plotting import show
 from ..utils.deprecation import deprecated
 from ..utils.mutable import mutable
 
@@ -386,7 +387,7 @@ class Spectrum(Block):
         self.fig.canvas.mpl_connect("pick_event", on_pick)
 
         #show the plot without blocking following code
-        plt.show(block=False)
+        show(self.fig)
 
         #return figure and axis for outside manipulation
         return self.fig, self.ax

pathsim-0.29.2/src/pathsim/utils/plotting.py

@@ -0,0 +1,33 @@
+#########################################################################################
+##
+##                              PLOTTING HELPERS
+##                            (utils/plotting.py)
+##
+#########################################################################################
+
+# IMPORTS ===============================================================================
+
+import matplotlib.pyplot as plt
+
+from matplotlib.backend_bases import FigureManagerBase
+
+
+# FUNCTIONS =============================================================================
+
+def show(fig):
+    """Show a figure without blocking the following code, if the matplotlib
+    backend opens figures in a window.
+
+    Backends without a window, such as the inline backend of Jupyter or 'Agg',
+    use the generic 'FigureManagerBase'. Jupyter displays the figure at the end
+    of the cell by itself, so the figure stays open for changes after the plot
+    call, for example 'ax.set_title(...)'.
+
+    Parameters
+    ----------
+    fig : matplotlib.figure.Figure
+        figure to show
+    """
+    if type(fig.canvas.manager) is FigureManagerBase:
+        return
+    plt.show(block=False)

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pathsim
-Version: 0.29.0
+Version: 0.29.2
 Summary: A differentiable block based hybrid system simulation framework.
 Author-email: Milan Rother <milan.rother@gmx.de>
 License: MIT

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim.egg-info/SOURCES.txt

@@ -260,6 +260,7 @@ src/pathsim/utils/gilbert.py
 src/pathsim/utils/graph.py
 src/pathsim/utils/logger.py
 src/pathsim/utils/mutable.py
+src/pathsim/utils/plotting.py
 src/pathsim/utils/portreference.py
 src/pathsim/utils/progresstracker.py
 src/pathsim/utils/realtimeplotter.py
@@ -393,6 +394,7 @@ tests/pathsim/utils/test_gilbert.py
 tests/pathsim/utils/test_graph.py
 tests/pathsim/utils/test_logger.py
 tests/pathsim/utils/test_mutable.py
+tests/pathsim/utils/test_plotting.py
 tests/pathsim/utils/test_portreference.py
 tests/pathsim/utils/test_progresstracker.py
 tests/pathsim/utils/test_realtimeplotter.py

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim.egg-info/scm_file_list.json

@@ -254,6 +254,7 @@
     "src/pathsim/utils/graph.py",
     "src/pathsim/utils/logger.py",
     "src/pathsim/utils/mutable.py",
+    "src/pathsim/utils/plotting.py",
     "src/pathsim/utils/portreference.py",
     "src/pathsim/utils/progresstracker.py",
     "src/pathsim/utils/realtimeplotter.py",
@@ -387,6 +388,7 @@
     "tests/pathsim/utils/test_graph.py",
     "tests/pathsim/utils/test_logger.py",
     "tests/pathsim/utils/test_mutable.py",
+    "tests/pathsim/utils/test_plotting.py",
     "tests/pathsim/utils/test_portreference.py",
     "tests/pathsim/utils/test_progresstracker.py",
     "tests/pathsim/utils/test_realtimeplotter.py",

{pathsim-0.29.0 → pathsim-0.29.2}/src/pathsim.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.29.0",
+  "tag": "0.29.2",
   "distance": 0,
-  "node": "g220bc787c4a58a7b1e7d6bf8af71f1bafbe04ba1",
+  "node": "gc2d44b82b34737fa578d0dff84befb04b6ee8dd0",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-11-04"

{pathsim-0.29.0 → pathsim-0.29.2}/tests/pathsim/blocks/test_bvp.py

@@ -173,6 +173,28 @@ class TestBVP1D(unittest.TestCase):
         np.testing.assert_allclose(bvp.solution()[0, 2], 2.0*np.sin(np.pi/4), atol=1e-5)
 
 
+    def test_return_to_solved_input_after_failed_solve(self):
+        #a failed solve keeps the previous solution, returning to the input of
+        #that solution reuses it and reports success again (pathsim#275)
+        fun = lambda x, y, p, u: np.vstack([y[1], -y[0] if u[0] > 0 else np.nan*y[0]])
+        bc = lambda ya, yb, p, u: np.array([ya[0], yb[0] - u[0]])
+        bvp = BVP1D(fun, bc, n=2, domain=(0.0, np.pi/2))
+
+        bvp.inputs[0] = 2.0
+        bvp.update(0.0)
+        self.assertTrue(bvp.success)
+        y_ok = bvp.outputs.to_array()
+
+        bvp.inputs[0] = -1.0
+        bvp.update(0.0)
+        self.assertFalse(bvp.success)
+
+        bvp.inputs[0] = 2.0
+        bvp.update(0.0)
+        self.assertTrue(bvp.success)
+        np.testing.assert_array_equal(bvp.outputs.to_array(), y_ok)
+
+
     def test_input_unchanged_skips_resolve(self):
         #a re-evaluation with unchanged input must not trigger another solve,
         #but a changed input must

{pathsim-0.29.0 → pathsim-0.29.2}/tests/pathsim/blocks/test_scope.py

@@ -261,7 +261,6 @@ class TestScope(unittest.TestCase):
             self.assertIn("no recording", str(w[0].message))
 
 
-    @unittest.skip("Matplotlib/numpy compatibility issue in Python 3.13")
     def test_plot_with_data(self):
         """Test plot() with recorded data"""
 
@@ -324,7 +323,6 @@ class TestScope(unittest.TestCase):
             self.assertIn("not enough channels", str(w[0].message))
 
 
-    @unittest.skip("Matplotlib/numpy compatibility issue in Python 3.13")
     def test_plot2D_with_data(self):
         """Test plot2D() with 2 channels"""
 
@@ -408,7 +406,6 @@ class TestScope(unittest.TestCase):
             self.assertIn("at least 3 channels", str(w[0].message))
 
 
-    @unittest.skip("Matplotlib/numpy compatibility issue in Python 3.13")
     def test_plot3D_with_data(self):
         """Test plot3D() with 3 channels"""
 

{pathsim-0.29.0 → pathsim-0.29.2}/tests/pathsim/blocks/test_spectrum.py

@@ -265,7 +265,6 @@ class TestSpectrum(unittest.TestCase):
         S.update(10.0)
 
 
-    @unittest.skip("NumPy compatibility issue in Python 3.13")
     def test_read_with_state(self):
         """Test read returns spectrum from solver state"""
 
@@ -288,7 +287,6 @@ class TestSpectrum(unittest.TestCase):
         np.testing.assert_array_almost_equal(spec[0], state / S.time)
 
 
-    @unittest.skip("NumPy compatibility issue in Python 3.13")
     def test_read_with_alpha(self):
         """Test read with forgetting factor applies correct scaling"""
 
@@ -323,7 +321,6 @@ class TestSpectrum(unittest.TestCase):
         self.assertIsNone(result)
 
 
-    @unittest.skip("Matplotlib/numpy compatibility issue in Python 3.13")
     def test_plot_with_data(self):
         """Test plot creates figure with data"""
 
@@ -449,7 +446,6 @@ class TestRealtimeSpectrum(unittest.TestCase):
     Test the implementation of the 'RealtimeSpectrum' block class
     """
 
-    @unittest.skip("Matplotlib/numpy compatibility issue in Python 3.13")
     def test_init(self):
         """Test RealtimeSpectrum initialization"""
 
@@ -477,7 +473,6 @@ class TestRealtimeSpectrum(unittest.TestCase):
         self.assertIsNotNone(RS.plotter)
 
 
-    @unittest.skip("Matplotlib/numpy compatibility issue in Python 3.13")
     def test_step_early_time(self):
         """Test step before effective time > dt"""
 
@@ -500,7 +495,7 @@ class TestRealtimeSpectrum(unittest.TestCase):
         self.assertIsNone(scale)  # No rescale needed
 
 
-    @unittest.skip("Matplotlib/numpy compatibility issue in Python 3.13")
+    @unittest.skip("Base Solver.step does not return an error estimate")
     def test_step_after_wait(self):
         """Test step after wait period with solver"""
 

pathsim-0.29.2/tests/pathsim/utils/test_plotting.py

@@ -0,0 +1,63 @@
+########################################################################################
+##
+##                                  TESTS FOR
+##                              'utils.plotting.py'
+##
+##                              Milan Rother 2026
+##
+########################################################################################
+
+# IMPORTS ==============================================================================
+
+import unittest
+from unittest import mock
+
+import matplotlib
+matplotlib.use("Agg")
+import matplotlib.pyplot as plt
+
+from matplotlib.backend_bases import FigureManagerBase
+
+from pathsim.utils.plotting import show
+
+
+# TESTS ================================================================================
+
+class TestShow(unittest.TestCase):
+    """
+    Test the 'show' helper for figures
+    """
+
+    def tearDown(self):
+        plt.close("all")
+
+
+    def test_no_window(self):
+        """backends without a window (Agg, Jupyter inline) dont show"""
+
+        fig, _ = plt.subplots()
+        self.assertIs(type(fig.canvas.manager), FigureManagerBase)
+
+        with mock.patch("pathsim.utils.plotting.plt.show") as plt_show:
+            show(fig)
+            plt_show.assert_not_called()
+
+
+    def test_window(self):
+        """backends with a window show without blocking"""
+
+        class WindowManager(FigureManagerBase):
+            pass
+
+        fig, _ = plt.subplots()
+        fig.canvas.manager = WindowManager(fig.canvas, 1)
+
+        with mock.patch("pathsim.utils.plotting.plt.show") as plt_show:
+            show(fig)
+            plt_show.assert_called_once_with(block=False)
+
+
+# RUN TESTS LOCALLY ====================================================================
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)