Rename graph latency functions.

2 files changed, 14 insertions, 14 deletions

diff --git a/ecrts14/ecrts14.py b/ecrts14/ecrts14.py
index 9cc52de..c46d292 100755
--- a/ecrts14/ecrts14.py
+++ b/ecrts14/ecrts14.py
@@ -339,8 +339,8 @@ def process_dp(_dp):
                 this_method = {}
                 this_method['sched'] = is_sched
                 if is_sched:
-                    this_method['latencies'] = map(graph.bound_graph_response_time, graphs)
-                    this_method['ideal_latencies'] = map(graph.compute_ideal_response_time, graphs)
+                    this_method['latencies'] = map(graph.bound_graph_latency, graphs)
+                    this_method['ideal_latencies'] = map(graph.compute_ideal_graph_latency, graphs)
                 this_task_set[method] = this_method
         else:
             # global. no partitioning. all methods equivelent
@@ -349,8 +349,8 @@ def process_dp(_dp):
             this_method = {}
             this_method['sched'] = is_sched
             if is_sched:
-                this_method['latencies'] = map(graph.bound_graph_response_time, graphs)
-                this_method['ideal_latencies'] = map(graph.compute_ideal_response_time, graphs)
+                this_method['latencies'] = map(graph.bound_graph_latency, graphs)
+                this_method['ideal_latencies'] = map(graph.compute_ideal_graph_latency, graphs)
             for method, _, _ in TESTS:
                 this_task_set[method] = this_method
 
@@ -358,7 +358,7 @@ def process_dp(_dp):
         all_sched = True if num_method_sched == n_methods else False
 
         if all_sched:
-            hrt_ideal_response_times = map(graph.compute_hrt_ideal_response_time, graphs)
+            hrt_ideal_response_times = map(graph.compute_hrt_ideal_graph_latency, graphs)
 
             # they're all schedulable, so compute graph latencies
             # redo with job splitting
@@ -367,12 +367,12 @@ def process_dp(_dp):
                     # redo test to get the split-based latency
                     dp.job_splitting = True
                     is_sched, processed_ts = test(ts, graphs, subts, dp, overheads)
-                    this_task_set[method]['split_latencies'] = map(graph.bound_graph_response_time, graphs)
+                    this_task_set[method]['split_latencies'] = map(graph.bound_graph_latency, graphs)
             else:
                 # global. no partitioning. all methods equivelent
                 dp.job_splitting = True
                 is_sched, processed_ts = TESTS[0][2](ts, graphs, subts, dp, overheads)
-                split_lat = map(graph.bound_graph_response_time, graphs)
+                split_lat = map(graph.bound_graph_latency, graphs)
                 for method, _, _ in TESTS:
                     this_task_set[method]['split_latencies'] = split_lat
 
diff --git a/ecrts14/quick.py b/ecrts14/quick.py
index 9b3ec87..560b365 100755
--- a/ecrts14/quick.py
+++ b/ecrts14/quick.py
@@ -339,8 +339,8 @@ def process_dp(_dp):
                 this_method = {}
                 this_method['sched'] = is_sched
                 if is_sched:
-                    this_method['latencies'] = map(graph.bound_graph_response_time, graphs)
-                    this_method['ideal_latencies'] = map(graph.compute_ideal_response_time, graphs)
+                    this_method['latencies'] = map(graph.bound_graph_latency, graphs)
+                    this_method['ideal_latencies'] = map(graph.compute_ideal_graph_latency, graphs)
                 this_task_set[method] = this_method
         else:
             # global. no partitioning. all methods equivelent
@@ -349,8 +349,8 @@ def process_dp(_dp):
             this_method = {}
             this_method['sched'] = is_sched
             if is_sched:
-                this_method['latencies'] = map(graph.bound_graph_response_time, graphs)
-                this_method['ideal_latencies'] = map(graph.compute_ideal_response_time, graphs)
+                this_method['latencies'] = map(graph.bound_graph_latency, graphs)
+                this_method['ideal_latencies'] = map(graph.compute_ideal_graph_latency, graphs)
             for method, _, _ in TESTS:
                 this_task_set[method] = this_method
 
@@ -358,7 +358,7 @@ def process_dp(_dp):
         all_sched = True if num_method_sched == n_methods else False
 
         if all_sched:
-            hrt_ideal_response_times = map(graph.compute_hrt_ideal_response_time, graphs)
+            hrt_ideal_response_times = map(graph.compute_hrt_ideal_graph_latency, graphs)
 
             # they're all schedulable, so compute graph latencies
             # redo with job splitting
@@ -367,12 +367,12 @@ def process_dp(_dp):
                     # redo test to get the split-based latency
                     dp.job_splitting = True
                     is_sched, processed_ts = test(ts, graphs, subts, dp, overheads)
-                    this_task_set[method]['split_latencies'] = map(graph.bound_graph_response_time, graphs)
+                    this_task_set[method]['split_latencies'] = map(graph.bound_graph_latency, graphs)
             else:
                 # global. no partitioning. all methods equivelent
                 dp.job_splitting = True
                 is_sched, processed_ts = TESTS[0][2](ts, graphs, subts, dp, overheads)
-                split_lat = map(graph.bound_graph_response_time, graphs)
+                split_lat = map(graph.bound_graph_latency, graphs)
                 for method, _, _ in TESTS:
                     this_task_set[method]['split_latencies'] = split_lat