key placement and pdf file name

1 files changed, 6 insertions, 5 deletions

diff --git a/plot_rtas12_betaexp.py b/plot_rtas12_betaexp.py
index dd26e85..11f29b3 100755
--- a/plot_rtas12_betaexp.py
+++ b/plot_rtas12_betaexp.py
@@ -69,14 +69,15 @@ def plot_metric(opts, dat_dir, metric, coin_prob, xr=None):
     ."""
     # each coin value gets a plot
     p = Plot()
-    p.output = '{0}/beta-exp_metric={1}_prob={2}'.format(dat_dir, metric, coin_prob)
+    p.output = '{0}/beta-exp-metric={1}-prob={2}'.format(
+            dat_dir, metric, str(coin_prob).replace('.', ''))
     if xr is not None:
-        p.output = '{0}_zoom=1'.format(p.output)
+        p.output = '{0}-zoom=1'.format(p.output)
     p.output = '{0}.pdf'.format(p.output)
         
     p.format = 'pdf'
 
-    for (level, enforcement) in [(l, e) for l in ('b', 'c') for e in (0, 1)]:
+    for (level, enforcement) in [(l, e) for l in ('c', 'b') for e in (1, 0)]:
         fname = '{0}/beta_be={1}_prob={2}.csv'.format(dat_dir, enforcement, coin_prob)
         ycol = g_col('{0}-{1}'.format(metric, level))
         if enforcement == 1:
@@ -95,8 +96,8 @@ def plot_metric(opts, dat_dir, metric, coin_prob, xr=None):
     if -1 != metric.find('ratio'):
         p.ylog = False
         p.yrange = (-0.01, 1.01)
-    if metric == 'miss-ratio' and coin_prob == 0.1:
-        p.key = 'top right'
+    if (metric == 'rel-rt-mean' and coin_prob == 0.1 and xr is None):
+        p.key = 'at 1, 100'
     p.gnuplot_exec()
 
 def main():