tidy up find_next_individual

Author: geraintpalmer

ciw/node.py

@@ -128,7 +128,7 @@ def begin_service_if_possible_accept(self,
     def begin_interrupted_individuals_service(self, current_time, srvr):
         """
         Restarts the next interrupted individual's service (by
-        resampking service time)
+        resampling service time)
         """
         ind = [i for i in self.interrupted_individuals][0]
         ind.service_time = self.get_service_time(ind.customer_class,
@@ -268,9 +268,8 @@ def find_next_individual(self):
         """
         Finds the next individual that should now finish service
         """
-        next_individual_indices = [i for i, x in enumerate(
-            [ind.service_end_date for ind in self.all_individuals]
-            ) if x == self.next_event_date]
+        next_individual_indices = [i for i, ind in enumerate(
+            self.all_individuals) if ind.service_end_date == self.next_event_date]
         if len(next_individual_indices) > 1:
             next_individual_index = random_choice(next_individual_indices)
         else:

ciw/tests/test_node.py

@@ -100,7 +100,6 @@ def test_change_customer_class_method(self):
         self.assertEqual(ind.customer_class, 1)
         self.assertEqual(ind.previous_class, 0)
 
-
         # Test for case of having priorities
         ciw.seed(14)
         parameters_dictionary = ciw.load_parameters(
@@ -155,7 +154,6 @@ def test_change_customer_class_method(self):
         self.assertEqual(ind.priority_class, 0)
         self.assertEqual(ind.previous_class, 0)
 
-
     def test_block_individual_method(self):
         ciw.seed(4)
         Q = ciw.Simulation(ciw.create_network_from_yml(
@@ -215,7 +213,6 @@ def test_release_method(self):
         N.update_next_event_date(N.next_event_date)
         self.assertEqual(round(N.next_event_date, 5), 0.06447)
 
-
     def test_begin_service_if_possible_release_method(self):
         ciw.seed(50)
         Q = ciw.Simulation(ciw.create_network_from_yml(

ciw/tests/test_simulation.py

@@ -354,7 +354,6 @@ def test_simultaneous_events_example(self):
                   'Transition_matrices': [[1.0, 0.0], [0.0, 0.0]],
                   'Number_of_servers': [2, 1]}
 
-
         ciw.seed(36)
         Q = ciw.Simulation(ciw.create_network(**params))
         Q.simulate_until_max_time(36)