salabim 24.0.5__tar.gz → 24.0.7__tar.gz

{salabim-24.0.5 → salabim-24.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.5
+Version: 24.0.7
 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.5 → salabim-24.0.7}/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.5"
+version = "24.0.7"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

{salabim-24.0.5 → salabim-24.0.7}/salabim/LICENSE.txt

@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{salabim-24.0.5 → salabim-24.0.7}/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.5"
+__version__ = "24.0.7"
 
 import heapq
 import random
@@ -3375,6 +3375,15 @@ class _StateMonitor(Monitor):
     def _value(self, value: Any) -> None:
         self.parent.set(value)
 
+    @property
+    def value(self) -> Any:
+        return self.parent.get()
+
+    @value.setter
+    def value(self, value: Any) -> None:
+        self.parent.set(value)
+
+
 
 class _SystemMonitor(Monitor):
     @property
@@ -10048,6 +10057,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
@@ -10080,6 +10092,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
@@ -10230,6 +10243,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
@@ -26655,7 +26677,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
@@ -27093,7 +27118,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.5 → salabim-24.0.7}/salabim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.5
+Version: 24.0.7
 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.5 → salabim-24.0.7}/tests/test_monitor.py

@@ -635,10 +635,14 @@ def test_as_dataframe_use_datetime0():
     df0=pd.DataFrame({"t": [d(2023,1,3),d(2023,1,5)], "level monitor0.x":[11,12]})
     assert df0.equals(df)
     df = level_monitor0.as_dataframe(use_datetime0=True)
-    df0=pd.DataFrame({"t":[d(2023,1,1), d(2023,1,2,7,12),d(2023,1,3,12),d(2023,1,5,19,12)], "level monitor0.x": [0,11,12,14.5]})
+    df0=pd.DataFrame({"t":[d(2023,1,1), d(2023,1,2,7,12),d(2023,1,3,12),d(2023,1,5,19,12),d(2023,1,6,0,0)], "level monitor0.x": [0,11,12,14.5,14.5]})
     assert df0.equals(df)
     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__])

{salabim-24.0.5 → salabim-24.0.7}/tests/test_state.py

@@ -110,6 +110,17 @@ def test_urgent_and_priority(capsys):
     with pytest.raises(TypeError):
         X(process="", priority=1)
 
+def test_value():
+    env = sim.Environment(trace=False)
+    s1 = sim.State(name="s.", value=0)
+    env.run(1)
+    s1.value.value+=1
+    env.run(1)
+    s1.value.value+=1
+    env.run(1)
+
+    assert s1()==2
+
 
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", __file__])