salabim 24.0.6__py3-none-any.whl → 24.0.8__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- salabim/salabim.py +22 -5
- {salabim-24.0.6.dist-info → salabim-24.0.8.dist-info}/METADATA +1 -1
- {salabim-24.0.6.dist-info → salabim-24.0.8.dist-info}/RECORD +5 -5
- {salabim-24.0.6.dist-info → salabim-24.0.8.dist-info}/WHEEL +1 -1
- {salabim-24.0.6.dist-info → salabim-24.0.8.dist-info}/top_level.txt +0 -0
salabim/salabim.py
CHANGED
@@ -1,13 +1,13 @@
|
|
1
|
-
# _ _ _ ____ _ _ ___
|
2
|
-
# ___ __ _ | | __ _ | |__ (_) _ __ ___ |___ \ | || | / _ \
|
3
|
-
# / __| / _` || | / _` || '_ \ | || '_ ` _ \ __) || || |_ | | | |
|
1
|
+
# _ _ _ ____ _ _ ___ ___
|
2
|
+
# ___ __ _ | | __ _ | |__ (_) _ __ ___ |___ \ | || | / _ \ ( _ )
|
3
|
+
# / __| / _` || | / _` || '_ \ | || '_ ` _ \ __) || || |_ | | | | / _ \
|
4
4
|
# \__ \| (_| || || (_| || |_) || || | | | | | / __/ |__ _| _ | |_| | _ | (_) |
|
5
5
|
# |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_| |_____| |_| (_) \___/ (_) \___/
|
6
6
|
# discrete event simulation
|
7
7
|
#
|
8
8
|
# see www.salabim.org for more information, the documentation and license information
|
9
9
|
|
10
|
-
__version__ = "24.0.
|
10
|
+
__version__ = "24.0.8"
|
11
11
|
|
12
12
|
import heapq
|
13
13
|
import random
|
@@ -9017,6 +9017,7 @@ by adding:
|
|
9017
9017
|
self.status._value = waiting
|
9018
9018
|
self._reschedule(scheduled_time, schedule_priority, urgent, "wait", cap_now)
|
9019
9019
|
else:
|
9020
|
+
return # ***
|
9020
9021
|
if self.env._yieldless:
|
9021
9022
|
if self is self.env._current_component:
|
9022
9023
|
self.env._glet.switch()
|
@@ -10057,6 +10058,9 @@ class Environment:
|
|
10057
10058
|
This is particularly useful when running a simulation on a server.
|
10058
10059
|
Note that this will show a slight performance increase, when creating videos.
|
10059
10060
|
|
10061
|
+
Any valid parameter for Environment.animation_parameters() will be forwarded to animation_parameters(), e.g.
|
10062
|
+
env = sim.Environment(trace=True, animation=True, speed=5)
|
10063
|
+
|
10060
10064
|
Note
|
10061
10065
|
----
|
10062
10066
|
The trace may be switched on/off later with trace
|
@@ -10089,6 +10093,7 @@ class Environment:
|
|
10089
10093
|
if isdefault_env:
|
10090
10094
|
name = "default environment"
|
10091
10095
|
_set_name(name, Environment._nameserialize, self)
|
10096
|
+
|
10092
10097
|
self._nameserializeMonitor = {} # required here for to_freeze functionality
|
10093
10098
|
self._time_unit = _time_unit_lookup(time_unit)
|
10094
10099
|
self._time_unit_name = time_unit
|
@@ -10239,6 +10244,15 @@ class Environment:
|
|
10239
10244
|
|
10240
10245
|
self.an_clocktext()
|
10241
10246
|
|
10247
|
+
ap_parameters= [parameter for parameter in inspect.signature(self.animation_parameters).parameters]
|
10248
|
+
ap_kwargs={}
|
10249
|
+
for k,v in list(kwargs.items()):
|
10250
|
+
if k in ap_parameters:
|
10251
|
+
del kwargs[k]
|
10252
|
+
ap_kwargs[k]=v
|
10253
|
+
if ap_kwargs:
|
10254
|
+
self.animation_parameters(**ap_kwargs)
|
10255
|
+
|
10242
10256
|
self.setup(*args, **kwargs)
|
10243
10257
|
|
10244
10258
|
# ENVIRONMENT ANNOTATION START
|
@@ -26664,7 +26678,10 @@ class ImageContainer:
|
|
26664
26678
|
|
26665
26679
|
def init(self, spec):
|
26666
26680
|
can_animate(try_only=True) # to load PIL
|
26681
|
+
|
26667
26682
|
if isinstance(spec, (str, Path)):
|
26683
|
+
spec=str(spec) # to process Path correctly
|
26684
|
+
|
26668
26685
|
if spec == "":
|
26669
26686
|
im = Image.new("RGBA", (1, 1), (0, 0, 0, 0))
|
26670
26687
|
# (0, 0) raises an error on some platforms
|
@@ -27102,7 +27119,7 @@ reset()
|
|
27102
27119
|
set_environment_aliases()
|
27103
27120
|
|
27104
27121
|
if __name__ == "__main__":
|
27105
|
-
sys.path.insert(0, str(Path
|
27122
|
+
sys.path.insert(0, str(Path(__file__).parent / ".." / "misc"))
|
27106
27123
|
try:
|
27107
27124
|
import salabim_exp
|
27108
27125
|
except Exception as e:
|
@@ -3,8 +3,8 @@ salabim/LICENSE.txt,sha256=qHlBa-POyexatCxDTjSKMlYtkBFQDn9lu-YV_1L6V0U,1106
|
|
3
3
|
salabim/__init__.py,sha256=r7qPLvlmX0dkZDyjuTo8Jo3ex3sD1L4pmK6K5ib9vyw,56
|
4
4
|
salabim/calibri.ttf,sha256=RWpf8Uo31RfvGGNaSt9-2sXSuN87AVE_NFMRsV3LhBk,1330156
|
5
5
|
salabim/mplus-1m-regular.ttf,sha256=EuFHr90BJjuAn_r5MleJFN-WfkeWJ4tf7DweI5zr8tU,289812
|
6
|
-
salabim/salabim.py,sha256=
|
7
|
-
salabim-24.0.
|
8
|
-
salabim-24.0.
|
9
|
-
salabim-24.0.
|
10
|
-
salabim-24.0.
|
6
|
+
salabim/salabim.py,sha256=OX3rJfwIprY__9CKYYrV6RVbYvrk2iuS6KnPAkb2t5A,1094679
|
7
|
+
salabim-24.0.8.dist-info/METADATA,sha256=YYXDNK-VP-iYY1rsBNc3VTCjeCyVwqJbYAz23zY4dCw,3449
|
8
|
+
salabim-24.0.8.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
|
9
|
+
salabim-24.0.8.dist-info/top_level.txt,sha256=UE6zVlbi3F6T5ma1a_5TrojMaF21GYKDt9svvm0U4cQ,8
|
10
|
+
salabim-24.0.8.dist-info/RECORD,,
|
File without changes
|