From 497871211a4c987761ebaf55043d22dc3e94b909 Mon Sep 17 00:00:00 2001
From: Anne-Liza <a.m.r.m.bruggeman@student.tudelft.nl>
Date: Thu, 6 Sep 2018 09:44:00 +0200
Subject: [PATCH] Bug fix in runtime calculation
Former-commit-id: beed375466a1954736c9e3e59c43a61c6a008a36
---
kadmos/graph/graph_data.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kadmos/graph/graph_data.py b/kadmos/graph/graph_data.py
index 70d8ce311..49ca52487 100644
--- a/kadmos/graph/graph_data.py
+++ b/kadmos/graph/graph_data.py
@@ -851,15 +851,15 @@ class DataGraph(KadmosGraph):
waiting_list = dict(updated_waiting_list)
# Add timestep to the time line
if get_time_line:
- time_line.append([total_runtime, list(waiting_list), running.keys(), list(finished)])
+ time_line.append([total_runtime, waiting_list.keys(), running.keys(), list(finished)])
# When the running list is updated, the next time step can be determined
time_step = min(running.values())
# Let all modules run for the time of the time step
updated_running_list = dict(running)
for node in running:
- running[node] -= time_step
+ updated_running_list[node] -= time_step
# If node is finished, move it to the finished list
- if running[node] == 0:
+ if updated_running_list[node] == 0:
finished.add(node)
del updated_running_list[node]
running = dict(updated_running_list)
@@ -868,7 +868,7 @@ class DataGraph(KadmosGraph):
if get_time_line:
# Add final step to time line
- time_line.append([total_runtime, list(waiting_list), running.keys(), list(finished)])
+ time_line.append([total_runtime, waiting_list.keys(), running.keys(), list(finished)])
return time_line
else:
return total_runtime
--
GitLab