correct plotting error

1 files changed, 18 insertions, 17 deletions

diff --git a/plot_rtas12.py b/plot_rtas12.py
index 5942a88..aeba823 100755
--- a/plot_rtas12.py
+++ b/plot_rtas12.py
@@ -80,38 +80,37 @@ def set_plot_opts(p):
         ]
 
 
-def plot_release(data_dir):
+def plot_release(data_dir, ycol, title, fname):
     p = Plot()
-    p.output = '{0}/overhead=RELEASE.pdf'.format(data_dir)
+    p.output = '{0}/{1}'.format(data_dir, fname)
     p.format = 'pdf'
 
-    for rel_type in ['RELEASE', 'LVLA-RELEASE']:
+    for o_type in ['RELEASE', 'LVLA-RELEASE']:
         for sched in SCHEDULERS:
-            fname = '{0}/scheduler={1}_overhead={2}.csv'.format(data_dir, sched, rel_type)
-            ti = '{0}{1}'.format(get_sched_title(sched), get_overhead_title(rel_type))
+            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=gnuplot_col('avg'), title=ti)]
+                ycol=ycol, title=ti)]
     p.xlabel = 'number of tasks'
     p.ylabel = 'overhead (microseconds)'
-    p.title = 'release overheads'
+    p.title = title
     set_plot_opts(p)
     p.gnuplot_exec()
 
-def plot_sched(data_dir):
+def plot_sched(data_dir, ycol, title, fname):
     p = Plot()
-    p.output = '{0}/overhead=SCHED.pdf'.format(data_dir)
+    p.output = '{0}/{1}'.format(data_dir, fname)
     p.format = 'pdf'
-    p.key = 'top left'
 
-    for sched_type in ['SCHED', 'LVLA-SCHED']:
+    for o_type in ['SCHED', 'LVLA-SCHED']:
         for sched in SCHEDULERS:
-            fname = '{0}/scheduler={1}_overhead=SCHED.csv'.format(data_dir, sched)
-            ti = '{0}{1}'.format(get_sched_title(sched), get_overhead_title(sched_type))
+            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=gnuplot_col('avg'), title=ti)]
+                ycol=ycol, title=ti)]
     p.xlabel = 'number of tasks'
     p.ylabel = 'overhead (microseconds)'
-    p.title = 'scheduling overheads'
+    p.title = title
     set_plot_opts(p)
     p.gnuplot_exec()
 
@@ -121,8 +120,10 @@ def main():
         usage('missing args')
 
     data_dir = sys.argv[1]
-    plot_sched(data_dir)
-    plot_release(data_dir)
+    plot_sched(data_dir, gnuplot_col('max'), 'worst case scheduling overhead', 'overhead=SCHED_type=MAX.pdf')
+    plot_release(data_dir, gnuplot_col('max'), 'worst case release overhead', 'overhead=RELEASE_type=MAX.pdf')
+    plot_sched(data_dir, gnuplot_col('avg'), 'average scheduling overhead', 'overhead=SCHED_type=AVG.pdf')
+    plot_release(data_dir, gnuplot_col('avg'), 'average release overhead', 'overhead=RELEASE_type=AVG.pdf')
     
 if __name__ == '__main__':
     main()