@@ -78,16 +78,13 @@ def test_preemptive_act_schedule(self):
7878 processing_times = get_random_array (size = n , min_value = 1 , max_value = 3 )
7979 release_times = get_random_array (size = n , max_value = 15 )
8080 # sort activities by release time
81- sorted_tuples = sorted (zip (processing_times , release_times ), key = lambda x : x [1 ])
82- processing_times , release_times = Array (x [0 ] for x in sorted_tuples ), Array (x [1 ] for x in sorted_tuples )
83- release_times .append (math .inf )
84- original_processing_times = copy .deepcopy (processing_times )
85- original_release_times = copy .deepcopy (release_times )
81+ times = sorted (zip (processing_times , release_times ), key = lambda x : x [1 ])
82+ sorted_processing_times , sorted_release_times = Array (x [0 ] for x in times ), Array (x [1 ] for x in times )
8683
8784 actual_schedule = preemptive_act_schedule (processing_times , release_times )
8885
8986 for i in between (1 , n ):
90- assert_that (actual_schedule [i ], is_ (greater_than (release_times [i ])))
87+ assert_that (actual_schedule [i ], is_ (greater_than (sorted_release_times [i ])))
9188 actual_min_act = sum (actual_schedule ) / actual_schedule .length
92- expected_min_act = get_min_preemptive_act_bruteforce (original_processing_times , original_release_times )
89+ expected_min_act = get_min_preemptive_act_bruteforce (sorted_processing_times , sorted_release_times )
9390 assert_that (actual_min_act , is_ (equal_to (expected_min_act )))
0 commit comments