some restructrue so distributions see the simulation object

Author: geraintpalmer

ciw/arrival_node.py

@@ -27,6 +27,7 @@ def __init__(self, simulation):
             self.simulation.network.number_of_classes)}
             for nd in range(self.simulation.network.number_of_nodes)}
 
+    def initialise(self):
         self.initialise_event_dates_dict()
         self.find_next_event_date()
 

ciw/simulation.py

@@ -43,9 +43,11 @@ def __init__(self, network,
         self.inter_arrival_times = self.find_arrival_dists()
         self.service_times = self.find_service_dists()
         self.batch_sizes = self.find_batching_dists()
+        self.show_simulation_to_distributions()
         self.number_of_priority_classes = self.network.number_of_priority_classes
         self.transitive_nodes = [self.NodeType(i + 1, self) for i in range(network.number_of_nodes)]
         self.nodes = ([self.ArrivalNodeType(self)] + self.transitive_nodes + [ExitNode()])
+        self.nodes[0].initialise()
         self.statetracker = tracker
         self.statetracker.initialise(self)
         self.times_dictionary = {self.statetracker.hash_state(): 0.0}
@@ -96,6 +98,16 @@ def find_batching_dists(self):
             for clss in range(self.network.number_of_classes)}
             for node in range(self.network.number_of_nodes)}
 
+    def show_simulation_to_distributions(self):
+        """
+        Adds the simulation object as an attribute of the distribution objects
+        """
+        for clss in range(self.network.number_of_classes):
+            for nd in range(self.network.number_of_nodes):
+                self.inter_arrival_times[nd + 1][clss].simulation = self
+                self.service_times[nd + 1][clss].simulation = self
+                self.batch_sizes[nd + 1][clss].simulation = self
+
     def find_next_active_node(self):
         """
         Returns the next active node, the node whose next_event_date is next:

ciw/tests/test_arrival_node.py

@@ -13,6 +13,7 @@ def test_init_method(self):
         Q = ciw.Simulation(ciw.create_network_from_yml(
             'ciw/tests/testing_parameters/params.yml'))
         N = ciw.ArrivalNode(Q)
+        N.initialise()
         self.assertEqual(round(N.next_event_date, 5), 0.00440)
         self.assertEqual(N.number_of_individuals, 0)
         self.assertEqual(N.number_of_individuals_per_class, [0, 0, 0])
@@ -31,6 +32,7 @@ def test_initialise_event_dates_dict_method(self):
         Q = ciw.Simulation(ciw.create_network_from_yml(
             'ciw/tests/testing_parameters/params.yml'))
         N = ciw.ArrivalNode(Q)
+        N.initialise()
         dates_dict_1 = {1: {0: 0.4362282541, 1: 0.2672232406, 2: 0.3864256273},
                         2: {0: 0.1636952311, 1: 0.0714709565, 2: 0.8065738414},
                         3: {0: 0.4088480190, 1: 0.0514323248, 2: 0.8132038176},
@@ -58,6 +60,7 @@ def test_find_next_event_date_method(self):
         Q = ciw.Simulation(ciw.create_network_from_yml(
             'ciw/tests/testing_parameters/params.yml'))
         N = ciw.ArrivalNode(Q)
+        N.initialise()
         self.assertEqual(round(N.next_event_date, 5), 0.00105)
         N.find_next_event_date()
         self.assertEqual(round(N.next_event_date, 5), 0.00105)
@@ -74,6 +77,7 @@ def test_have_event_method(self):
         Q = ciw.Simulation(ciw.create_network_from_yml(
             'ciw/tests/testing_parameters/params.yml'))
         N = ciw.ArrivalNode(Q)
+        N.initialise()
         self.assertEqual(N.number_of_individuals, 0)
         self.assertEqual(N.number_of_individuals_per_class, [0, 0, 0])
         self.assertEqual(N.number_accepted_individuals, 0)
@@ -113,6 +117,7 @@ def test_have_event_method(self):
         Q = ciw.Simulation(ciw.create_network_from_yml(
             'ciw/tests/testing_parameters/params.yml'))
         N = ciw.ArrivalNode(Q)
+        N.initialise()
         self.assertEqual(N.number_of_individuals, 0)
         self.assertEqual(N.number_of_individuals_per_class, [0, 0, 0])
         self.assertEqual(N.number_accepted_individuals, 0)