Easier to parse lines for lvls a, b, and c

1 files changed, 28 insertions, 16 deletions

diff --git a/plot_rtas12.py b/plot_rtas12.py
index 825827d..6d1d408 100755
--- a/plot_rtas12.py
+++ b/plot_rtas12.py
@@ -72,7 +72,7 @@ def set_plot_opts(opts, p):
     p.default_style += ' smooth bezier'
     p.key = 'off'
     p.monochrome = False
-    p.dashed_lines = False
+    p.dashed_lines = True
     p.xrange = (18, 122)
     p.yrange = (0, '')
 
@@ -94,21 +94,31 @@ def set_plot_opts(opts, p):
     for i, c in enumerate(p.curves):
         c.style = "linespoints ls %d" % (i + 1)
 
-    try:
-        # don't use yellow if we have this curve
-        p.curves[5].style = "linespoints ls 7"
-    except IndexError:
-        pass
+    # try:
+    #     # don't use yellow if we have this curve
+    #     p.curves[5].style = "linespoints ls 7"
+    # except IndexError:
+    #     pass
 
     p.line_styles = [
-        (1, "lw {0} ps {1}".format(line_width, point_size)),
-        (2, "lw {0} ps {1}".format(line_width, point_size)),
-        (3, "lw {0} ps {1}".format(line_width, point_size)),
-        (4, "lw {0} ps {1}".format(line_width, point_size)),
-        (5, 'pt 6 lw {0} ps {1} lc rgbcolor "#ff910d"'.format(line_width, point_size)),
-        (6, "pt 7 lw {0} ps {1}".format(line_width, point_size)),
-        (7, 'lw {0} ps {1} lc rgbcolor "#000000"'.format(line_width, point_size)),
-        (8, "lw {0} ps {1}".format(line_width, point_size)),
+        (1, 'lt 1 pt 1 lw {0} ps {1} lc rgbcolor "#ff0000"'.format(line_width, point_size)),
+        (2, 'lt 1 pt 4 lw {0} ps {1} lc rgbcolor "#00ff00"'.format(line_width, point_size)),
+        (3, 'lt 1 pt 7 lw {0} ps {1} lc rgbcolor "#0000ff"'.format(line_width, point_size)),
+        (4, 'lt 2 pt 1 lw {0} ps {1} lc rgbcolor "#ff0000"'.format(line_width, point_size)),
+        (5, 'lt 2 pt 4 lw {0} ps {1} lc rgbcolor "#00ff00"'.format(line_width, point_size)),
+        (6, 'lt 2 pt 7 lw {0} ps {1} lc rgbcolor "#0000ff"'.format(line_width, point_size)),
+        (7, 'lt 3 pt 1 lw {0} ps {1} lc rgbcolor "#ff0000"'.format(line_width, point_size)),
+        (8, 'lt 3 pt 4 lw {0} ps {1} lc rgbcolor "#00ff00"'.format(line_width, point_size)),
+        (9, 'lt 3 pt 7 lw {0} ps {1} lc rgbcolor "#0000ff"'.format(line_width, point_size)),
+        # (1, 'lw {0} ps {1} lc rgbcolor "#ff0000"'.format(line_width, point_size)),
+        # (2, "lw {0} ps {1} lt 2".format(line_width, point_size)),
+        # (3, "lw {0} ps {1} lt3 ".format(line_width, point_size)),
+        # (4, "lw {0} ps {1}".format(line_width, point_size)),
+        # (5, 'pt 6 lw {0} ps {1} lc rgbcolor "#ff910d"'.format(line_width, point_size)),
+        # (6, "pt 7 lw {0} ps {1}".format(line_width, point_size)),
+        # (7, 'lw {0} ps {1} lc rgbcolor "#000000"'.format(line_width, point_size)),
+        # (8, "lw {0} ps {1}".format(line_width, point_size)),
+        # (9, "lw {0} ps {1}".format(line_width, point_size)),
         ]
 
 
@@ -171,7 +181,8 @@ 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 ['LVLA-RELEASE','LVLB-RELEASE', 'LVLC-RELEASE']:
+    # for o_type in ['LVLA-RELEASE','LVLB-RELEASE', 'LVLC-RELEASE']:
+    for o_type in ['LVLA-RELEASE','LVLC-RELEASE']:
         for sched in SCHEDULERS:
             # if o_type == 'RELEASE':
             #     # we have to make the regular release include the level-A
@@ -217,7 +228,8 @@ def plot_sched(opts, data_dir, ycol, title, fname):
     p = Plot()
     p.output = '{0}/{1}'.format(data_dir, fname)
 
-    for o_type in ['LVLA-SCHED','LVLB-SCHED','LVLC-SCHED']:
+#    for o_type in ['LVLA-SCHED','LVLB-SCHED','LVLC-SCHED']:
+    for o_type in ['LVLA-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))