Merge pull request #170 from CiwPython/state-tracking

State tracking

Author: geraintpalmer

.travis.yml

@@ -2,7 +2,8 @@ language: python
 python:
   - 3.5
   - 3.6
-  - "pypy3.5"
+  - 3.7
+  - "pypy3"
 
 cache:
   directories:

AUTHORS.rst

@@ -14,3 +14,4 @@ Ciw has been developed by the following contributors:
 + `Emma Aspland <https://github.com/EmmaAspland>`_
 + `Henry Wilde <https://github.com/daffidwilde>`_
 + `timlathy <https://github.com/timlathy>`_
++ `Michalis Panayides <https://github.com/11michalis11>`_

README.rst

@@ -43,7 +43,8 @@ Current supported version of Python:
 
 - Python 3.5
 - Python 3.6
-- PyPy3.5
+- Python 3.7
+- PyPy3
 
 Usage
 -----

appveyor.yml

@@ -1,5 +1,6 @@
 environment:
   matrix:
+    - PYTHON: "C:\\Python37"
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python35"
 install:

ciw/simulation.py

@@ -192,6 +192,7 @@ def simulate_until_max_time(self, max_simulation_time, progress_bar=False):
 
         while self.current_time < max_simulation_time:
             next_active_node = self.event_and_return_nextnode(next_active_node)
+            self.statetracker.timestamp()
 
             if progress_bar:
                 remaining_time = max_simulation_time - self.progress_bar.n

ciw/tests/test_simulation.py

@@ -198,14 +198,43 @@ def test_simulate_until_max_customers_with_pbar_method(self):
         self.assertEqual(Q3.progress_bar.n, max_custs)
 
     def test_simulate_until_deadlock_method(self):
+        # NaiveBlocking tracker
         ciw.seed(3)
         Q = ciw.Simulation(ciw.create_network_from_yml(
             'ciw/tests/testing_parameters/params_deadlock.yml'),
              deadlock_detector=ciw.deadlock.StateDigraph(),
-             tracker=ciw.trackers.NaiveTracker())
+             tracker=ciw.trackers.NaiveBlocking())
         Q.simulate_until_deadlock()
         self.assertEqual(round(Q.times_to_deadlock[((0, 0), (0, 0))], 8), 53.88526441)
 
+        # SystemPopulation tracker
+        ciw.seed(3)
+        Q = ciw.Simulation(ciw.create_network_from_yml(
+            'ciw/tests/testing_parameters/params_deadlock.yml'),
+             deadlock_detector=ciw.deadlock.StateDigraph(),
+             tracker=ciw.trackers.SystemPopulation())
+        Q.simulate_until_deadlock()
+        self.assertEqual(round(Q.times_to_deadlock[0], 8), 53.88526441)
+
+        # NodePopulation tracker
+        ciw.seed(3)
+        Q = ciw.Simulation(ciw.create_network_from_yml(
+            'ciw/tests/testing_parameters/params_deadlock.yml'),
+             deadlock_detector=ciw.deadlock.StateDigraph(),
+             tracker=ciw.trackers.NodePopulation())
+        Q.simulate_until_deadlock()
+        self.assertEqual(round(Q.times_to_deadlock[(0, 0)], 8), 53.88526441)
+
+        # NodeClassMatrix tracker
+        ciw.seed(3)
+        Q = ciw.Simulation(ciw.create_network_from_yml(
+            'ciw/tests/testing_parameters/params_deadlock.yml'),
+             deadlock_detector=ciw.deadlock.StateDigraph(),
+             tracker=ciw.trackers.NodeClassMatrix())
+        Q.simulate_until_deadlock()
+        self.assertEqual(round(Q.times_to_deadlock[((0,), (0,))], 8), 53.88526441)
+
+
     def test_detect_deadlock_method(self):
         Q = ciw.Simulation(ciw.create_network_from_yml(
             'ciw/tests/testing_parameters/params_deadlock.yml'),
@@ -731,7 +760,7 @@ def test_schedules_and_blockages_work_together(self):
             queue_capacities=[2, 2]
         )
         ciw.seed(11)
-        Q = ciw.Simulation(N, deadlock_detector=ciw.deadlock.StateDigraph(),tracker=ciw.trackers.NaiveTracker())
+        Q = ciw.Simulation(N, deadlock_detector=ciw.deadlock.StateDigraph(),tracker=ciw.trackers.NaiveBlocking())
         Q.simulate_until_deadlock()
         ttd = Q.times_to_deadlock[((0, 0), (0, 0))]
         self.assertEqual(round(ttd, 5), 119.65819)