Update node.py

FC-Li · ariskaratzikos · Feb 6, 2024 · Feb 14, 2024 · Feb 14, 2024 · Feb 15, 2024
commit 22e6341934f0ffed721c4f37f417819c5110a81c
diff --git a/core/node.py b/core/node.py
@@ -103,18 +103,20 @@ def response_time(self, machines=None):
     def all_response_time_tuples(self, machines=None):  
         avg_time = 0.0
         ls = []
-        tuples = []
+        batch_times = []
+        service_times = []
         if machines is None:
             machines = self.machines
         running_task_instances = self.running_task_instances(machines)
         ls.extend(running_task_instances)
         waiting_task_instances = waiting_task_instances(machines)
         ls.extend(waiting_task_instances)
         for task_instance in ls:
-            tuple = (task_instance.response_time, task_instance.task.job.type)
-            tuples.append(tuple)
-        return tuples
-
+            if (task_instance.task.job.type == 0):
+                service_times.append(task_instance.response_time)
+            if (task_instance.task.job.type == 1):
+                batch_times.append(task_instance.response_time)
+        return service_times, batch_times
     def remaining_time(self, machines=None):
         avg_time = 0.0
         if machines is None: