seperated level overheads

1 files changed, 17 insertions, 14 deletions

diff --git a/plot_rtas12.py b/plot_rtas12.py
index d5e9ed9..825827d 100755
--- a/plot_rtas12.py
+++ b/plot_rtas12.py
@@ -56,10 +56,13 @@ def get_sched_title(sched):
     return SCHEDULERS[sched]
 
 def get_overhead_title(ov):
-    OV = {'SCHED': '(A, B, C)',
-          'LVLA-SCHED': '(A)',
-          'RELEASE': '(A, B, C)',
-          'LVLA-RELEASE': '(A)'}
+    OV = {'LVLA-SCHED': '(A)',
+          'LVLB-SCHED': '(B)',
+          'LVLC-SCHED': '(C)',
+          'LVLA-RELEASE': '(A)',
+          'LVLB-RELEASE': '(B)',
+          'LVLC-RELEASE': '(C)',
+}
     return OV[ov]
 
 def set_plot_opts(opts, p):
@@ -168,16 +171,16 @@ def plot_release(opts, data_dir, ycol, title, fname):
     p.output = '{0}/{1}'.format(data_dir, fname)
     refs = [] # need to save reference to file handle so it is not deleted
 
-    for o_type in ['RELEASE', 'LVLA-RELEASE']:
+    for o_type in ['LVLA-RELEASE','LVLB-RELEASE', 'LVLC-RELEASE']:
         for sched in SCHEDULERS:
-            if o_type == 'RELEASE':
-                # we have to make the regular release include the level-A
-                # releases
-                fname, ref = include_level_a_releases(data_dir, o_type,
-                        sched, ycol)
-                refs.append(ref)
-            else:
-                fname = '{0}/scheduler={1}_overhead={2}.csv'.format(data_dir, sched, o_type)
+            # if o_type == 'RELEASE':
+            #     # we have to make the regular release include the level-A
+            #     # releases
+            #     fname, ref = include_level_a_releases(data_dir, o_type,
+            #             sched, ycol)
+            #     refs.append(ref)
+            # else:
+            fname = '{0}/scheduler={1}_overhead={2}.csv'.format(data_dir, sched, o_type)
             ti = '{0} {1}'.format(get_sched_title(sched), get_overhead_title(o_type))
             p.curves += [curve(fname=fname, xcol=gnuplot_col('n_tasks'),
                 ycol=ycol, title=ti)]
@@ -214,7 +217,7 @@ def plot_sched(opts, data_dir, ycol, title, fname):
     p = Plot()
     p.output = '{0}/{1}'.format(data_dir, fname)
 
-    for o_type in ['SCHED', 'LVLA-SCHED']:
+    for o_type in ['LVLA-SCHED','LVLB-SCHED','LVLC-SCHED']:
         for sched in SCHEDULERS:
             fname = '{0}/scheduler={1}_overhead={2}.csv'.format(data_dir, sched, o_type)
             ti = '{0} {1}'.format(get_sched_title(sched), get_overhead_title(o_type))