salabim 24.0.4.post0__tar.gz → 24.0.5__tar.gz

{salabim-24.0.4.post0 → salabim-24.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.4.post0
+Version: 24.0.5
 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
@@ -11,13 +11,11 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 
-<img src="https://www.salabim.org/salabim_logo_payoff.png" />
-
-</br>
+ <img src="https://www.salabim.org/salabim_logo_payoff.png" width=400 />
 
 Salabim is a Python library for object-oriented discrete event simulation (DES) and animation.
 
-## Introduction
+### Introduction
 
 Discrete event simulation (DES) finds applications in various logistical domains including production facilities, warehousing, airports, hospitals, mining, materials handling, steel mills, and computer network analysis.
 
@@ -29,36 +27,51 @@ Salabim follows a well-proven and intuitive process description method similar t
 - Stores
 - States
 - Monitors for data collection and presentation
-- 2D and 3D animation (including video production)
+- 2D and 3D animation (including video production) (see below)
 - Tracing facilities
 - Advanced statistical sampling
 
 In contrast to some other Python DES packages, salabim does not require the use of yield statements for process control, making it more straightforward to use. Salabim has minimal requirements, especially when animation is disabled.
 
-## Features and documentation
+
+
+### Some salabim animations
+
+ <img src="https://www.salabim.org/cymulation3d.gif" width=700 />
+
+ <img src="https://www.salabim.org/elevator.gif" width=700 />
+
+ <img src="https://www.salabim.org/lights-3d.gif" width=700 />
+
+### 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 [www.salabim.org/manual](www.salabim.org/manual) for detailed documentation.
 
-## Contributing and Reporting Issues
+### Resources
+
+The salabim package can be found on GitHub: www.github.com/salabim/salabim
+
+And on PyPI: https://pypi.org/project/salabim/
+
+### Contributing and Reporting Issues
 
 Contributions to salabim are highly appreciated! You can contribute by issuing a pull request or submitting an issue on [GitHub](https://github.com/salabim/salabim). Alternatively, you can use the [salabim Google user group](https://groups.google.com/g/salabim) for discussions and reporting issues.
 
-## License
+### License
 
 Salabim is licensed under the MIT License. For details, please refer to the [LICENSE](LICENSE) file.
 
-## Support
+### Support
 
-Ruud van der Ham is available and willing to help users with issues related to the package and modeling in general. He also provides services such as code and model reviews, consultancy, and training.
+Ruud van der Ham, the core developer, is available and willing to help users with issues related to the package and modeling in general. He also provides services such as code and model reviews, consultancy, and training.
 
-## Getting Started
+### Getting Started
 
 To start using salabim, visit [www.salabim.org](www.salabim.org) for installation instructions and further details.
 
-## Badges
+### Badges
 
 ![PyPI](https://img.shields.io/pypi/v/salabim) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/salabim) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/salabim)
-
 ![PyPI - License](https://img.shields.io/pypi/l/salabim) ![Black](https://img.shields.io/badge/code%20style-black-000000.svg) 
- ![GitHub last commit](https://img.shields.io/github/last-commit/salabim/salabim)
+![GitHub last commit](https://img.shields.io/github/last-commit/salabim/salabim)

{salabim-24.0.4.post0 → salabim-24.0.5}/README.md

@@ -1,10 +1,8 @@
-<img src="https://www.salabim.org/salabim_logo_payoff.png" />
-
-</br>
+ <img src="https://www.salabim.org/salabim_logo_payoff.png" width=400 />
 
 Salabim is a Python library for object-oriented discrete event simulation (DES) and animation.
 
-## Introduction
+### Introduction
 
 Discrete event simulation (DES) finds applications in various logistical domains including production facilities, warehousing, airports, hospitals, mining, materials handling, steel mills, and computer network analysis.
 
@@ -16,36 +14,51 @@ Salabim follows a well-proven and intuitive process description method similar t
 - Stores
 - States
 - Monitors for data collection and presentation
-- 2D and 3D animation (including video production)
+- 2D and 3D animation (including video production) (see below)
 - Tracing facilities
 - Advanced statistical sampling
 
 In contrast to some other Python DES packages, salabim does not require the use of yield statements for process control, making it more straightforward to use. Salabim has minimal requirements, especially when animation is disabled.
 
-## Features and documentation
+
+
+### Some salabim animations
+
+ <img src="https://www.salabim.org/cymulation3d.gif" width=700 />
+
+ <img src="https://www.salabim.org/elevator.gif" width=700 />
+
+ <img src="https://www.salabim.org/lights-3d.gif" width=700 />
+
+### 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 [www.salabim.org/manual](www.salabim.org/manual) for detailed documentation.
 
-## Contributing and Reporting Issues
+### Resources
+
+The salabim package can be found on GitHub: www.github.com/salabim/salabim
+
+And on PyPI: https://pypi.org/project/salabim/
+
+### Contributing and Reporting Issues
 
 Contributions to salabim are highly appreciated! You can contribute by issuing a pull request or submitting an issue on [GitHub](https://github.com/salabim/salabim). Alternatively, you can use the [salabim Google user group](https://groups.google.com/g/salabim) for discussions and reporting issues.
 
-## License
+### License
 
 Salabim is licensed under the MIT License. For details, please refer to the [LICENSE](LICENSE) file.
 
-## Support
+### Support
 
-Ruud van der Ham is available and willing to help users with issues related to the package and modeling in general. He also provides services such as code and model reviews, consultancy, and training.
+Ruud van der Ham, the core developer, is available and willing to help users with issues related to the package and modeling in general. He also provides services such as code and model reviews, consultancy, and training.
 
-## Getting Started
+### Getting Started
 
 To start using salabim, visit [www.salabim.org](www.salabim.org) for installation instructions and further details.
 
-## Badges
+### Badges
 
 ![PyPI](https://img.shields.io/pypi/v/salabim) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/salabim) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/salabim)
-
 ![PyPI - License](https://img.shields.io/pypi/l/salabim) ![Black](https://img.shields.io/badge/code%20style-black-000000.svg) 
- ![GitHub last commit](https://img.shields.io/github/last-commit/salabim/salabim)
+![GitHub last commit](https://img.shields.io/github/last-commit/salabim/salabim)

{salabim-24.0.4.post0 → salabim-24.0.5}/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.4-0"
+version = "24.0.5"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [
@@ -27,4 +27,4 @@ Repository = "https://github.com/salabim/salabim"
 packages = ["salabim"]
 
 [tool.setuptools.package-data]
-"*" = ["*.ttf", "*.txt"]
+"*" = ["*.ttf", "*.txt"]

salabim-24.0.5/salabim/__init__.py

@@ -0,0 +1,2 @@
+from .salabim import *
+from .salabim import __version__

{salabim-24.0.4.post0 → salabim-24.0.5}/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.4" 
+__version__ = "24.0.5"
 
 import heapq
 import random
@@ -581,6 +581,7 @@ class Monitor:
         name = kwargs.pop("name", None)
         if kwargs:
             raise TypeError("merge() got an unexpected keyword argument '" + tuple(kwargs)[0] + "'")
+        new_xtype = self.xtype
 
         for m in monitors:
             m._block_stats_only()
@@ -589,9 +590,12 @@ class Monitor:
             if self._level != m._level:
                 raise TypeError("not possible to mix level monitor with non level monitor")
             if self.xtype != m.xtype:
-                raise TypeError("not possible to mix type '" + self.xtype + "' with type '" + m.xtype + "'")
+                new_xtype = "any"
             if self.env != m.env:
                 raise TypeError("not possible to mix environments")
+            if m.xtype != new_xtype:
+                new_xtype = "any"  # to allow mixed xtypes
+
         if name is None:
             if self.name().endswith(".merged"):
                 # this to avoid multiple .merged (particularly when merging with the + operator)
@@ -599,7 +603,7 @@ class Monitor:
             else:
                 name = self.name() + ".merged"
 
-        new = _SystemMonitor(name=name, type=self.xtype, level=self._level, env=self.env)
+        new = _SystemMonitor(name=name, type=new_xtype, level=self._level, env=self.env)
 
         merge = [self] + list(monitors)
 
@@ -3156,7 +3160,9 @@ class Monitor:
         self.cached_xweight[(ex0, force_numeric)] = (t_extra, xweight)
         return xweight
 
-    def as_dataframe(self, include_t: bool = True, use_datetime0=False) -> "dataframe":
+    def as_dataframe(
+        self, include_t: bool = True, use_datetime0=False, ex0: bool = False, exoff=False, force_numeric: bool = True, add_now: bool = True
+    ) -> "dataframe":
         """
         makes a pandas dataframe with the x-values and optionally the t-values of the monitors
 
@@ -3188,14 +3194,15 @@ class Monitor:
             import pandas as pd
         except ImportError:
             raise ImportError("Monitor.as_dataframe requires pandas")
+        xs, ts = self.xt(ex0=ex0, exoff=exoff, force_numeric=force_numeric, add_now=add_now)
         if include_t:
             if use_datetime0:
-                df = pd.DataFrame({"t": [self.env.t_to_datetime(t) for t in self._t]})
+                df = pd.DataFrame({"t": [self.env.t_to_datetime(t) for t in ts]})
             else:
-                df = pd.DataFrame({"t": self._t})
+                df = pd.DataFrame({"t": ts})
         else:
             df = pd.DataFrame()
-        df[f"{self.name()}.x"] = self._x
+        df[f"{self.name()}.x"] = xs
 
         return df
 
@@ -13642,7 +13649,7 @@ class Environment:
 
         lastwidth = 0
         for fontsize in range(1, 300):
-            f = getfont(font, fontsize)
+            f, heightA = getfont(font, fontsize)
             thiswidth, thisheight = f.getbbox(text)[2:]
             if thiswidth > width:
                 break
@@ -23428,7 +23435,7 @@ class Resource:
             else:
                 q = quantity
 
-            self._claimed_quantity -= q_claimers
+            self._claimed_quantity -= q
             if self._claimed_quantity < 1e-8:
                 self._claimed_quantity = 0
             self.claimed_quantity.tally(self._claimed_quantity)
@@ -27086,6 +27093,7 @@ reset()
 set_environment_aliases()
 
 if __name__ == "__main__":
+    sys.path.insert(0, str(Path.cwd() / "misc"))
     try:
         import salabim_exp
     except Exception as e:

{salabim-24.0.4.post0 → salabim-24.0.5}/salabim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: salabim
-Version: 24.0.4.post0
+Version: 24.0.5
 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
@@ -11,13 +11,11 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 
-<img src="https://www.salabim.org/salabim_logo_payoff.png" />
-
-</br>
+ <img src="https://www.salabim.org/salabim_logo_payoff.png" width=400 />
 
 Salabim is a Python library for object-oriented discrete event simulation (DES) and animation.
 
-## Introduction
+### Introduction
 
 Discrete event simulation (DES) finds applications in various logistical domains including production facilities, warehousing, airports, hospitals, mining, materials handling, steel mills, and computer network analysis.
 
@@ -29,36 +27,51 @@ Salabim follows a well-proven and intuitive process description method similar t
 - Stores
 - States
 - Monitors for data collection and presentation
-- 2D and 3D animation (including video production)
+- 2D and 3D animation (including video production) (see below)
 - Tracing facilities
 - Advanced statistical sampling
 
 In contrast to some other Python DES packages, salabim does not require the use of yield statements for process control, making it more straightforward to use. Salabim has minimal requirements, especially when animation is disabled.
 
-## Features and documentation
+
+
+### Some salabim animations
+
+ <img src="https://www.salabim.org/cymulation3d.gif" width=700 />
+
+ <img src="https://www.salabim.org/elevator.gif" width=700 />
+
+ <img src="https://www.salabim.org/lights-3d.gif" width=700 />
+
+### 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 [www.salabim.org/manual](www.salabim.org/manual) for detailed documentation.
 
-## Contributing and Reporting Issues
+### Resources
+
+The salabim package can be found on GitHub: www.github.com/salabim/salabim
+
+And on PyPI: https://pypi.org/project/salabim/
+
+### Contributing and Reporting Issues
 
 Contributions to salabim are highly appreciated! You can contribute by issuing a pull request or submitting an issue on [GitHub](https://github.com/salabim/salabim). Alternatively, you can use the [salabim Google user group](https://groups.google.com/g/salabim) for discussions and reporting issues.
 
-## License
+### License
 
 Salabim is licensed under the MIT License. For details, please refer to the [LICENSE](LICENSE) file.
 
-## Support
+### Support
 
-Ruud van der Ham is available and willing to help users with issues related to the package and modeling in general. He also provides services such as code and model reviews, consultancy, and training.
+Ruud van der Ham, the core developer, is available and willing to help users with issues related to the package and modeling in general. He also provides services such as code and model reviews, consultancy, and training.
 
-## Getting Started
+### Getting Started
 
 To start using salabim, visit [www.salabim.org](www.salabim.org) for installation instructions and further details.
 
-## Badges
+### Badges
 
 ![PyPI](https://img.shields.io/pypi/v/salabim) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/salabim) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/salabim)
-
 ![PyPI - License](https://img.shields.io/pypi/l/salabim) ![Black](https://img.shields.io/badge/code%20style-black-000000.svg) 
- ![GitHub last commit](https://img.shields.io/github/last-commit/salabim/salabim)
+![GitHub last commit](https://img.shields.io/github/last-commit/salabim/salabim)

{salabim-24.0.4.post0 → salabim-24.0.5}/salabim.egg-info/SOURCES.txt

@@ -2,14 +2,15 @@ README.md
 pyproject.toml
 salabim/DejaVuSansMono.ttf
 salabim/LICENSE.txt
+salabim/__init__.py
 salabim/calibri.ttf
-salabim/changelog.txt
 salabim/mplus-1m-regular.ttf
 salabim/salabim.py
 salabim.egg-info/PKG-INFO
 salabim.egg-info/SOURCES.txt
 salabim.egg-info/dependency_links.txt
 salabim.egg-info/top_level.txt
+tests/test salabim.py
 tests/test_cap_now.py
 tests/test_componentgenerator.py
 tests/test_datetime.py
@@ -18,7 +19,6 @@ tests/test_misc.py
 tests/test_monitor.py
 tests/test_process.py
 tests/test_queue.py
-tests/test_salabim.py
 tests/test_state.py
 tests/test_store.py
 tests/test_timeunit.py

salabim-24.0.5/tests/test salabim.py

@@ -0,0 +1,12 @@
+import pytest
+import os
+import sys
+from pathlib import Path
+
+if __name__ == "__main__":
+    file_folder = Path(__file__).parent
+    top_folder = (file_folder / "..").resolve()
+    sys.path.insert(0, str(top_folder))
+    os.chdir(file_folder)
+
+    pytest.main(["-vv", "-s"])

{salabim-24.0.4.post0 → salabim-24.0.5}/tests/test_monitor.py

@@ -397,13 +397,13 @@ def test_level_values():
     class Interrupter(sim.Component):
         def process(self):
             self.hold(6)
-            x0.interrupt()
-            x1.interrupt()
-            x2.interrupt()
+            for x in (x0,x1,x2):
+                if x.isscheduled():
+                    x.interrupt()
             self.hold(4)
-            x0.resume()
-            x1.resume()
-            x2.resume()
+            for x in (x0,x1,x2):
+                if x.isinterrupted():
+                    x.resume()
 
     def status_map(status):
         return sim.statuses().index(status)
@@ -425,7 +425,7 @@ def test_level_values():
 
     env.run(till=50)
 
-    assert x1.status.value_duration("requesting") == pytest.approx(10.1)
+    assert x1.status.value_duration("requesting") == pytest.approx(14.1)
 
     assert x0.mode.xt(force_numeric=None) == (["abc", "ghi", "jkl", "jkl"], array("d", [0.0, 4.3, 18.4, 50.0]))
     assert x0.status.xt(force_numeric=None) == (