salabim 24.0.6__tar.gz → 24.0.8__tar.gz

{salabim-24.0.6 → salabim-24.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.6
+Version: 24.0.8
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-24.0.6 → salabim-24.0.8}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
 ]
 description = "salabim - discrete event simulation in Python"
-version = "24.0.6"
+version = "24.0.8"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

{salabim-24.0.6 → salabim-24.0.8}/salabim/salabim.py

@@ -1,13 +1,13 @@
-#               _         _      _               ____   _  _        ___       __
-#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | || |      / _ \     / /_
-#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) || || |_    | | | |   | '_ \
+#               _         _      _               ____   _  _        ___       ___
+#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | || |      / _ \     ( _ )
+#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) || || |_    | | | |    / _ \
 #  \__ \| (_| || || (_| || |_) || || | | | | |   / __/ |__   _| _ | |_| | _ | (_) |
 #  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____|   |_|  (_) \___/ (_) \___/
 #                    discrete event simulation
 #
 #  see www.salabim.org for more information, the documentation and license information
 
-__version__ = "24.0.6"
+__version__ = "24.0.8"
 
 import heapq
 import random
@@ -9017,6 +9017,7 @@ by adding:
             self.status._value = waiting
             self._reschedule(scheduled_time, schedule_priority, urgent, "wait", cap_now)
         else:
+            return # ***
             if self.env._yieldless:
                 if self is self.env._current_component:
                     self.env._glet.switch()
@@ -10057,6 +10058,9 @@ class Environment:
         This is particularly useful when running a simulation on a server.
         Note that this will show a slight performance increase, when creating videos.
 
+    Any valid parameter for Environment.animation_parameters() will be forwarded to animation_parameters(), e.g.
+        env = sim.Environment(trace=True, animation=True, speed=5)
+
     Note
     ----
     The trace may be switched on/off later with trace
@@ -10089,6 +10093,7 @@ class Environment:
             if isdefault_env:
                 name = "default environment"
         _set_name(name, Environment._nameserialize, self)
+
         self._nameserializeMonitor = {}  # required here for to_freeze functionality
         self._time_unit = _time_unit_lookup(time_unit)
         self._time_unit_name = time_unit
@@ -10239,6 +10244,15 @@ class Environment:
 
         self.an_clocktext()
 
+        ap_parameters= [parameter for parameter in inspect.signature(self.animation_parameters).parameters]
+        ap_kwargs={}
+        for k,v in list(kwargs.items()):
+            if k in ap_parameters:
+                del kwargs[k]   
+                ap_kwargs[k]=v
+        if ap_kwargs:
+            self.animation_parameters(**ap_kwargs)
+
         self.setup(*args, **kwargs)
 
     # ENVIRONMENT ANNOTATION START
@@ -26664,7 +26678,10 @@ class ImageContainer:
 
     def init(self, spec):
         can_animate(try_only=True)  # to load PIL
+
         if isinstance(spec, (str, Path)):
+            spec=str(spec)  # to process Path correctly
+
             if spec == "":
                 im = Image.new("RGBA", (1, 1), (0, 0, 0, 0))
                 # (0, 0) raises an error on some platforms
@@ -27102,7 +27119,7 @@ reset()
 set_environment_aliases()
 
 if __name__ == "__main__":
-    sys.path.insert(0, str(Path.cwd() / "misc"))
+    sys.path.insert(0, str(Path(__file__).parent / ".." / "misc"))
     try:
         import salabim_exp
     except Exception as e:

{salabim-24.0.6 → salabim-24.0.8}/salabim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.6
+Version: 24.0.8
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-24.0.6 → salabim-24.0.8}/tests/test_monitor.py

@@ -640,5 +640,9 @@ def test_as_dataframe_use_datetime0():
     df = level_monitor0.as_dataframe()
     df0=pd.DataFrame({"t":[0,1.3,2.5,4.8,5.0], "level monitor0.x": [0,11,12,14.5,14.5]})
     assert df0.equals(df)    
+    df = level_monitor0.as_dataframe(add_now=False)
+    df0=pd.DataFrame({"t":[0,1.3,2.5,4.8], "level monitor0.x": [0,11,12,14.5]})
+    assert df0.equals(df)    
+
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])