salabim 25.0.5__py3-none-any.whl → 25.0.7__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.5"
+__version__ = "25.0.7"
 import heapq
 import random
 import time
@@ -3209,7 +3209,7 @@ class Monitor:
             if ex0:
                 x0 = [vx for vx in x if vx != 0]
                 if typecode:
-                    x0 = array.array(typecode, x)
+                    x0 = array.array(typecode, x0)
 
             if self._weight:
                 if ex0:
@@ -7201,20 +7201,11 @@ class Component:
                 else:
                     self.env.print_trace("", "", self.name() + " create data component", self._modetxt())
         else:
-            _check_overlapping_parameters(self, "__init__", "process")
-            _check_overlapping_parameters(self, "setup", "process")
+            _check_overlapping_parameters(self, "__init__", process_name,process=p)
+            _check_overlapping_parameters(self, "setup", process_name,process=p)
 
             self.env.print_trace("", "", self.name() + " create", self._modetxt())
 
-            process_parameters = inspect.signature(self.process).parameters
-            init_parameters = inspect.signature(self.__init__).parameters
-            if process_parameters:
-                for parameter in process_parameters:
-                    if parameter in init_parameters:
-                        raise AttributeError(
-                            f"{self.__class__.__name__}.process() error: parameter '{parameter}' not allowed, because it is a parameter of {self.__class__.__name__}.__init__()"
-                        )
-
             kwargs_p = {}
 
             if kwargs:
@@ -25120,7 +25111,7 @@ def _set_name(name, _nameserialize, object):
         object._name = name
 
 
-def _check_overlapping_parameters(obj, method_name0, method_name1):
+def _check_overlapping_parameters(obj, method_name0, method_name1,process=None):
     """
     this function is a helper to see whether __init__, setup and process parameters overlap
 
@@ -25134,8 +25125,18 @@ def _check_overlapping_parameters(obj, method_name0, method_name1):
 
     method_name1 : str
         name of the second method to be tested
+
+    process: method
+        used for process check: should be the process methoc
     """
-    overlapping_parameters = set(inspect.signature(getattr(obj, method_name0)).parameters) & set(inspect.signature(getattr(obj, method_name1)).parameters)
+    method0=getattr(obj, method_name0)
+
+    if process is None:
+        method1=getattr(obj, method_name1)
+    else:
+        method1=process
+
+    overlapping_parameters = set(inspect.signature(method0).parameters) & set(inspect.signature(method1).parameters)
     if overlapping_parameters:
         raise TypeError(
             f"{obj.__class__.__name__}.{method_name1}()  error: parameter '{list(overlapping_parameters)[0]}' not allowed, because it is also a parameter of {obj.__class__.__name__}.{method_name0}()"

{salabim-25.0.5.dist-info → salabim-25.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: salabim
-Version: 25.0.5
+Version: 25.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
@@ -60,7 +60,7 @@ Contributions to salabim are highly appreciated! You can contribute by issuing a
 
 ### License
 
-Salabim is licensed under the MIT License. For details, please refer to the [LICENSE](LICENSE) file.
+Salabim is licensed under the MIT License.
 
 ### Support
 

{salabim-25.0.5.dist-info → salabim-25.0.7.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=8JPEhiyjRY0_wPsfbcyDbMXciSKdCSzM3bbNOCeFYmc,1126040
-salabim-25.0.5.dist-info/METADATA,sha256=Ia0_uZ1GmfCXq8sOlrLmwF9ART30RrA8jTYVrpIP7zc,3457
-salabim-25.0.5.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-salabim-25.0.5.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
-salabim-25.0.5.dist-info/RECORD,,
+salabim/salabim.py,sha256=fPJt1KQCzcKvY1zxVVsaZMWumB9KCUa03SySJaMYwoE,1125723
+salabim-25.0.7.dist-info/METADATA,sha256=ETRykdUqh-or7N6LKOHNYFV_FXhwa0QmCFYJx4jKPgI,3399
+salabim-25.0.7.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+salabim-25.0.7.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
+salabim-25.0.7.dist-info/RECORD,,

{salabim-25.0.5.dist-info → salabim-25.0.7.dist-info}/WHEEL

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