salabim 25.0.0__py3-none-any.whl → 25.0.2__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__ = "25.0.0"
+__version__ = "25.0.2"
 import heapq
 import random
 import time
@@ -42,11 +42,7 @@ import urllib.error
 import base64
 import zipfile
 from pathlib import Path
-try:
-    import peek
-except ModuleNotFoundError:
-    ...
-    
+   
 
 from typing import Any, Union, Iterable, Tuple, List, Callable, TextIO, Dict, Set, Type, Hashable, Optional
 
@@ -103,7 +99,7 @@ _ANSI_to_rgb = {
     "\033[0m": (),
 }
 
-ANSI=types.SimpleNamespace(_color_name_to_ANSI.items())
+ANSI=types.SimpleNamespace(**_color_name_to_ANSI)
 
 def a_log(*args):
     if not hasattr(a_log, "a_logfile_name"):
@@ -8125,7 +8121,7 @@ by adding:
         self,
         store: Union["Store", Iterable],
         filter: Callable = lambda c: True,
-        request_priority: Any = 0,
+        request_priority: float = 0,
         fail_priority: float = 0,
         urgent: bool = True,
         fail_at: float = None,
@@ -8305,7 +8301,7 @@ by adding:
         self,
         store: Union["Store", Iterable],
         item: "Component",
-        request_priority: float = None,
+        request_priority: float = 0,
         priority: float = 0,
         fail_priority: float = 0,
         urgent: bool = True,
@@ -8328,6 +8324,9 @@ by adding:
         request_priority: float
             put component in to_store_requesters according to the given priority (default 0)
 
+        priority : float
+            put component in the store according to this priority (default 0)
+
         fail_priority : float
             priority of the fail event
 
@@ -8475,7 +8474,7 @@ by adding:
         mode: Any = None,
         urgent: bool = False,
         request_priority: float = 0,
-        schedule_priority: float = 0,
+        priority: float = 0,
         cap_now: bool = None,
         oneof: bool = False,
         called_from: str = "request",
@@ -8619,7 +8618,7 @@ by adding:
                 scheduled_time = fail_at + self.env._offset
             else:
                 raise ValueError("both fail_at and fail_delay specified")
-
+        schedule_priority=priority
         self.set_mode(mode)
 
         self._failed = False
@@ -8918,7 +8917,6 @@ by adding:
                 self._release(r)
 
     def wait_for(self, cond, states, request_priority=0, priority=0, urgent=False, mode=None, fail_delay=None, fail_at=None, cap_now=None):
-        schedule_priority = priority
         """
         wait for any or all of the given state values are met
 
@@ -9021,6 +9019,7 @@ by adding:
                 raise ValueError("both fail_at and fail_delay specified")
 
         self.set_mode(mode)
+        schedule_priority=priority
 
         self._cond = cond  # add test ***
         for state in states:
@@ -9052,7 +9051,7 @@ by adding:
         mode: Any = None,
         urgent: bool = False,
         request_priority: float = 0,
-        schedule_priority: float = 0,
+        priority: float = 0,
         cap_now: bool = None,
     ) -> None:
         """
@@ -9223,10 +9222,11 @@ by adding:
                 scheduled_time = fail_at + self.env._offset
             else:
                 raise ValueError("both fail_at and fail_delay specified")
-
+        schedule_priority=priority
         self.set_mode(mode)
 
         for arg in args:
+
             value = True
             priority = request_priority
             if isinstance(arg, State):
@@ -9236,8 +9236,10 @@ by adding:
                 if not isinstance(state, State):
                     raise TypeError("incorrect specifier", arg)
                 if len(arg) >= 2:
-                    priority = arg[1]
+                    value = arg[1]
                 if len(arg) >= 3:
+                    priority = arg[2]
+                if len(arg) >= 4:
                     raise TypeError("incorrect specifier", arg)
             else:
                 raise TypeError("incorrect specifier", arg)
@@ -9260,6 +9262,7 @@ by adding:
         if not self._waits:
             raise TypeError("no states specified")
 
+
         self._remaining_duration = scheduled_time - self.env._now
 
         self._trywait()

{salabim-25.0.0.dist-info → salabim-25.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: salabim
-Version: 25.0.0
+Version: 25.0.2
 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-25.0.0.dist-info → salabim-25.0.2.dist-info}/RECORD

@@ -3,8 +3,8 @@ salabim/LICENSE.txt,sha256=eTPlcDJz4G0096Qv-wfMjm1Wxbd4ilDlsYg5rN4HjWQ,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=G7w62bzTMLNDN8paZkvYUA3MmvfPhwouL2nc7SLNO2A,1123563
-salabim-25.0.0.dist-info/METADATA,sha256=m_Yl7oewus-EsdjjsC1OpAwGJy7UE5UCNFBgOa4jfO4,3457
-salabim-25.0.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-salabim-25.0.0.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
-salabim-25.0.0.dist-info/RECORD,,
+salabim/salabim.py,sha256=HZGoHWng0YaeCS0BkGPAkavGHgMdw3JfQB6AlYLkRLA,1123721
+salabim-25.0.2.dist-info/METADATA,sha256=0QGrK9jj-tPPgRPqfnsuNBwjueyMGGr5PL5ZGe3t53o,3457
+salabim-25.0.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+salabim-25.0.2.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
+salabim-25.0.2.dist-info/RECORD,,