only timestamp at change of current_time

Author: geraintpalmer

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/trackers/state_tracker.py

@@ -10,7 +10,8 @@ def initialise(self, simulation):
         """
         self.simulation = simulation
         self.state = None
-        self.history = [[0.0, self.hash_state()]]
+        self.history = []
+        self.timestamp()
 
     def change_state_accept(self, node_id, cust_clss):
         """
@@ -58,22 +59,21 @@ def initialise(self, simulation):
         self.simulation = simulation
         self.state = [[0, 0] for i in range(
             self.simulation.network.number_of_nodes)]
-        self.history = [[0.0, self.hash_state()]]
+        self.history = []
+        self.timestamp()
 
     def change_state_accept(self, node_id, cust_clss):
         """
         Changes the state of the system when a customer is accepted.
         """
         self.state[node_id-1][0] += 1
-        self.timestamp()
 
     def change_state_block(self, node_id, destination, cust_clss):
         """
         Changes the state of the system when a customer gets blocked.
         """
         self.state[node_id-1][1] += 1
         self.state[node_id-1][0] -= 1
-        self.timestamp()
 
     def change_state_release(self, node_id, destination, cust_clss, blocked):
         """
@@ -83,7 +83,6 @@ def change_state_release(self, node_id, destination, cust_clss, blocked):
             self.state[node_id-1][1] -= 1
         else:
             self.state[node_id-1][0] -= 1
-        self.timestamp()
 
     def hash_state(self):
         """
@@ -118,22 +117,21 @@ def initialise(self, simulation):
             self.simulation.network.number_of_nodes)], [0 for i in range(
             self.simulation.network.number_of_nodes)]]
         self.increment = 1
-        self.history = [[0.0, self.hash_state()]]
+        self.history = []
+        self.timestamp()
 
     def change_state_accept(self, node_id, cust_clss):
         """
         Changes the state of the system when a customer is accepted.
         """
         self.state[-1][node_id-1] += 1
-        self.timestamp()
 
     def change_state_block(self, node_id, destination, cust_clss):
         """
         Changes the state of the system when a customer gets blocked.
         """
         self.state[0][node_id-1][destination-1].append(self.increment)
         self.increment += 1
-        self.timestamp()
 
     def change_state_release(self, node_id, destination, cust_clss, blocked):
         """
@@ -147,7 +145,6 @@ def change_state_release(self, node_id, destination, cust_clss, blocked):
             self.adjust_positions(position)
         else:
             self.state[-1][node_id-1] -= 1
-        self.timestamp()
 
     def find_blocked_position_and_pop(self, node_id, destination):
         """