salabim 24.0.9.post0__py3-none-any.whl → 24.0.10.post0__py3-none-any.whl

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.9" 
+__version__ = "24.0.10"
 
 import heapq
 import random
@@ -59,7 +59,7 @@ Windows = sys.platform.startswith("win")
 PyDroid = sys.platform == "linux" and any("pydroid" in v for v in os.environ.values())
 PyPy = platform.python_implementation() == "PyPy"
 Chromebook = "penguin" in platform.uname()
-PythonInExcel = not ("__file__" in globals())
+PythonInExcel = not ("__file__" in globals()) or ("REF" in globals()) # REF is for AnacondaCode
 
 
 def a_log(*args):
@@ -445,10 +445,8 @@ class Monitor:
         *args,
         **kwargs,
     ):
-        if env is None:
-            self.env = g.default_env
-        else:
-            self.env = env
+        self.env = _set_env(env)
+
         if isinstance(self.env, Environment):
             _set_name(name, self.env._nameserializeMonitor, self)
         else:
@@ -855,8 +853,10 @@ class Monitor:
             else:
                 stop += self.env._offset
                 stop_action = "b"  # non inclusive
-
-            stop = min(stop, self.env._now - self.env._offset)  # not self.now() in order to support frozen monitors
+            if self.env._animate:
+                stop=min(stop,self.env._t)
+            else:
+                stop = min(stop, self.env._now - self.env._offset)  # not self.now() in order to support frozen monitors
             actions.append((start, "a", 0, 0))
             actions.append((stop, stop_action, 0, 0))
         else:
@@ -888,8 +888,33 @@ class Monitor:
             new._x.append(curx)
 
         enabled = False
+        if self.env._animate:
+            _x=self._x[:]
+            _t=self._t[:]
+            if self._x:
+                _x.append(self._x[-1])
+                _t.append(self.env._t)
+            if isinstance(self._weight,bool):
+                _weight=self._weight
+            else:
+                _weight=self._weight[:]
+                _weight.append(self._weight[-1])
+        else:
+            _x=self._x
+            _t=self._t
+            _weight=self._weight
+
+
+        if self.env._animate:
+            if self._x:
+                _x.append(_x[-1])
+                _t.append(self.env._t)
+            try:
+                _weight.append(self.weight[-1])
+            except AttributeError:
+                ... # ignore if bool
         for t, type, x, weight in heapq.merge(
-            actions, zip(self._t, itertools.repeat("c"), self._x, self._weight if (self._weight and not self._level) else (1,) * len(self._x))
+            actions, zip(self._t, itertools.repeat("c"), _x, _weight if (_weight and not self._level) else (1,) * len(_x))
         ):
             if new._level:
                 if type == "a":
@@ -4293,10 +4318,8 @@ class Queue:
     """
 
     def __init__(self, name: str = None, monitor: Any = True, fill: Iterable = None, capacity: float = inf, env: "Environment" = None, *args, **kwargs) -> None:
-        if env is None:
-            self.env = g.default_env
-        else:
-            self.env = env
+        self.env = _set_env(env)
+
         _set_name(name, self.env._nameserializeQueue, self)
         self._head = Qmember()
         self._tail = Qmember()
@@ -5819,7 +5842,8 @@ class Animate3dBase(DynamicClass):
         self, visible: bool = True, keep: bool = True, arg: Any = None, layer: float = 0, parent: "Component" = None, env: "Environment" = None, **kwargs
     ) -> None:
         super().__init__()
-        self.env = g.default_env if env is None else env
+        self.env = _set_env(env)
+
         self.visible = visible
         self.keep = keep
         self.arg = self if arg is None else arg
@@ -7063,10 +7087,8 @@ class Component:
         env: "Environment" = None,
         **kwargs,
     ):
-        if env is None:
-            self.env = g.default_env
-        else:
-            self.env = env
+        self.env = _set_env(env)
+
         _set_name(name, self.env._nameserializeComponent, self)
         self._qmembers = {}
         self._process = None
@@ -14673,7 +14695,7 @@ class Environment:
         if self._last_animate != self._animate or self._last_paused != self._paused:
             for key in self._ui_window.key_dict:
                 field = self._ui_window[key]
-                if type(field) != sg.PySimpleGUI.HorizontalSeparator:
+                if type(field) != sg.HorizontalSeparator:
                     if self._paused:
                         field.update(visible=True)
                     else:
@@ -14850,9 +14872,10 @@ class Animate2dBase(DynamicClass):
         screen_coordinates = locals_["screen_coordinates"]
         over3d = locals_["over3d"]
 
-        self.env = g.default_env if env is None else env
+        self.env = _set_env(env)
+
         self.sequence = self.env.serialize()
-        self.arg = self if arg in (None, object) else arg 
+        self.arg = self if arg in (None, object) else arg
         self.over3d = _default_over3d if over3d is None else over3d
         self.screen_coordinates = screen_coordinates
         self.attached_to = attached_to
@@ -15930,7 +15953,8 @@ class Animate:
         animation_to: float = inf,
         env: "Environment" = None,
     ):
-        self.env = g.default_env if env is None else env
+        self.env = _set_env(env)
+
         self._image_ident = None  # denotes no image yet
         self._image = None
         self._image_x = 0
@@ -17052,7 +17076,8 @@ class AnimateEntry:
         env: "Environment" = None,
         xy_anchor: str = "sw",
     ):
-        self.env = g.default_env if env is None else env
+        self.env = _set_env(env)
+
         self.env.ui_objects.append(self)
         self.type = "entry"
         self.value = value
@@ -17197,7 +17222,8 @@ class AnimateButton:
         env: "Environment" = None,
         xy_anchor: str = "sw",
     ):
-        self.env = g.default_env if env is None else env
+        self.env = _set_env(env)
+
         self.type = "button"
         self.t0 = -inf
         self.t1 = inf
@@ -17378,7 +17404,7 @@ class AnimateSlider:
         labelcolor: ColorType = None,  # only for backward compatibility
         layer: float = None,  # only for backward compatibility
     ):
-        self.env = g.default_env if env is None else env
+        self.env = _set_env(env)
         n = round((vmax - vmin) / resolution) + 1
         self.vmin = vmin
         self.vmax = vmin + (n - 1) * resolution
@@ -22640,10 +22666,7 @@ class State:
     """
 
     def __init__(self, name: str = None, value: Any = False, type: str = "any", monitor: bool = True, env: "Environment" = None, *args, **kwargs):
-        if env is None:
-            self.env = g.default_env
-        else:
-            self.env = env
+        self.env = _set_env(env)
         _set_name(name, self.env._nameserializeState, self)
         self._value = value
         with self.env.suppress_trace():
@@ -23118,11 +23141,7 @@ class Resource:
         *args,
         **kwargs,
     ):
-        if env is None:
-            self.env = g.default_env
-        else:
-            self.env = env
-
+        self.env = _set_env(env)
         if initial_claimed_quantity != 0:
             if not anonymous:
                 raise ValueError("initial_claimed_quantity != 0 only allowed for anonymous resources")
@@ -23651,10 +23670,8 @@ class PeriodMonitor:
 
     def __init__(self, parent_monitor: "Monitor", periods: Iterable = None, period_monitor_names: Iterable = None, env: "Environment" = None):
         self.pc = _PeriodComponent(pm=self, skip_standby=True, suppress_trace=True)
-        if env is None:
-            self.env = g.default_env
-        else:
-            self.env = env
+        self.env = _set_env(env)
+
         if periods is None:
             periods = 24 * [1]
         self.periods = periods
@@ -26931,6 +26948,21 @@ def reset() -> None:
     random_seed()  # always start with seed 1234567
 
 
+def _set_env(env):
+    """
+    returns g._default_env if env is None
+    returns env, otherwise
+
+    will raise a ValueError if g.default_env is None (nit initialized)
+    """
+
+    if env is None:
+        if g.default_env is None:
+            raise ValueError("no default environment. Did yout forget to call sim.Environment()?")
+        return g.default_env
+    return env
+
+
 App = Environment
 
 

{salabim-24.0.9.post0.dist-info → salabim-24.0.10.post0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.9.post0
+Version: 24.0.10.post0
 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
@@ -46,11 +46,11 @@ In contrast to some other Python DES packages, salabim does not require the use
 ### Features and documentation
 
 - Cross-platform support: salabim runs on Windows, macOS, Linux, iOS/iPadOS (Pythonista), and can even be used with "Python In Excel".
-- Comprehensive documentation: Visit https://www.salabim.org/manual for detailed documentation.
+- Comprehensive documentation: Visit [www.salabim.org/manual](www.salabim.org/manual) for detailed documentation.
 
 ### Resources
 
-The salabim package can be found on GitHub: https://www.github.com/salabim/salabim
+The salabim package can be found on GitHub: www.github.com/salabim/salabim
 
 And on PyPI: https://pypi.org/project/salabim/
 

salabim-24.0.10.post0.dist-info/RECORD

@@ -0,0 +1,10 @@
+salabim/DejaVuSansMono.ttf,sha256=Z_oIXp5yp1Zaw2y2p3vaxwHhjHpG0MFbmwhxSh4aIEI,335068
+salabim/LICENSE.txt,sha256=qHlBa-POyexatCxDTjSKMlYtkBFQDn9lu-YV_1L6V0U,1106
+salabim/__init__.py,sha256=r7qPLvlmX0dkZDyjuTo8Jo3ex3sD1L4pmK6K5ib9vyw,56
+salabim/calibri.ttf,sha256=RWpf8Uo31RfvGGNaSt9-2sXSuN87AVE_NFMRsV3LhBk,1330156
+salabim/mplus-1m-regular.ttf,sha256=EuFHr90BJjuAn_r5MleJFN-WfkeWJ4tf7DweI5zr8tU,289812
+salabim/salabim.py,sha256=yxxH3U1Bjvv44M4mmmvgt1WSc_XFUG6IBKkfHwq8Xuc,1097141
+salabim-24.0.10.post0.dist-info/METADATA,sha256=eyCfM0Zj0M8Jd0f-YE3Of8J7Qs7jtAnxGYgMIbh1_ng,3456
+salabim-24.0.10.post0.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+salabim-24.0.10.post0.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
+salabim-24.0.10.post0.dist-info/RECORD,,

{salabim-24.0.9.post0.dist-info → salabim-24.0.10.post0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

salabim-24.0.9.post0.dist-info/RECORD

@@ -1,10 +0,0 @@
-salabim/DejaVuSansMono.ttf,sha256=Z_oIXp5yp1Zaw2y2p3vaxwHhjHpG0MFbmwhxSh4aIEI,335068
-salabim/LICENSE.txt,sha256=qHlBa-POyexatCxDTjSKMlYtkBFQDn9lu-YV_1L6V0U,1106
-salabim/__init__.py,sha256=r7qPLvlmX0dkZDyjuTo8Jo3ex3sD1L4pmK6K5ib9vyw,56
-salabim/calibri.ttf,sha256=RWpf8Uo31RfvGGNaSt9-2sXSuN87AVE_NFMRsV3LhBk,1330156
-salabim/mplus-1m-regular.ttf,sha256=EuFHr90BJjuAn_r5MleJFN-WfkeWJ4tf7DweI5zr8tU,289812
-salabim/salabim.py,sha256=q-JgqFxQnIoPg87Ajl1gHGVIFgOurphTsFi1pTSIBeE,1096452
-salabim-24.0.9.post0.dist-info/METADATA,sha256=UZ5-iS_aUBGMa3841kRvFZo0xiuNPXrFzSyjH4zoiHY,3445
-salabim-24.0.9.post0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-salabim-24.0.9.post0.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
-salabim-24.0.9.post0.dist-info/RECORD,,