Minor bug fixes from end-to-end testing.

6 files changed, 9 insertions, 9 deletions

diff --git a/config/config.py b/config/config.py
index 75130fd..49fd234 100644
--- a/config/config.py
+++ b/config/config.py
@@ -16,7 +16,7 @@ BINS = {'rtspin'    : get_executable('rtspin', 'liblitmus'),
 
 '''Names of output files.'''
 FILES = {'ft_data'    : 'ft.bin',
-         'ft_matches' : r'(ft.*\.bin)|(.*\.ft)',
+         'ft_matches' : r'(ft.*\.bin$)|(.*\.ft)',
          'linux_data' : 'trace.dat',
          'sched_data' : 'st-{}.bin',
          'log_data'   : 'trace.slog'}
diff --git a/gen/edf_generators.py b/gen/edf_generators.py
index 9bf6b8f..78b0ba1 100644
--- a/gen/edf_generators.py
+++ b/gen/edf_generators.py
@@ -36,7 +36,7 @@ class EdfGenerator(gen.Generator):
 
         self._customize(ts, exp_params)
 
-        self._write_schedule(dict(exp_params.items() + ('task_set', ts)))
+        self._write_schedule(dict(exp_params.items() + [('task_set', ts)]))
         self._write_params(exp_params)
 
     def _customize(self, taskset, exp_params):
diff --git a/gen_exps.py b/gen_exps.py
index cb05fe7..daee527 100755
--- a/gen_exps.py
+++ b/gen_exps.py
@@ -94,7 +94,7 @@ def main():
         print("Creating experiments using %s generator..." % gen_name)
 
         params = dict(gen_params.items() + global_params.items())
-        generator = GENERATORS[gen_name](params)
+        generator = GENERATORS[gen_name](params=params)
 
         generator.create_exps(opts.out_dir, opts.force, opts.trials)
 
diff --git a/parse_exps.py b/parse_exps.py
index 7c75f5f..8aa9b43 100755
--- a/parse_exps.py
+++ b/parse_exps.py
@@ -126,8 +126,8 @@ def main():
     if opts.ignore:
         for param in opts.ignore.split(","):
             builder.try_remove(param)
-        # Always average multiple trials
-        builder.try_remove(conf.PARAMS['trial'])
+    # Always average multiple trials
+    builder.try_remove(conf.PARAMS['trial'])
 
     col_map = builder.build()
     result_table = TupleTable(col_map)
diff --git a/plot/style.py b/plot/style.py
index fd1fa97..21c4e7e 100644
--- a/plot/style.py
+++ b/plot/style.py
@@ -7,7 +7,7 @@ class Style(namedtuple('SS', ['marker', 'line', 'color'])):
 
 class StyleMap(object):
     '''Maps configs (dicts) to specific line styles.'''
-    DEFAULT = Style('', '', 'k')
+    DEFAULT = Style('', '-', 'k')
 
     def __init__(self, col_list, col_values):
         '''Assign (some) columns in @col_list to fields in @Style to vary, and
@@ -15,7 +15,8 @@ class StyleMap(object):
         self.value_map = {}
         self.field_map = {}
 
-        for field, values in self.__get_all()._asdict().iteritems():
+        # TODO: undo this, switch to popping mechanism
+        for field, values in reversed([x for x in self.__get_all()._asdict().iteritems()]):
             if not col_list:
                 break
 
@@ -51,7 +52,6 @@ class StyleMap(object):
         key = []
 
         for column, values in self.value_map.iteritems():
-            # print("***%s, %s" % column, values)
             for v in values.keys():
                 sdict = dict([(column, v)])
                 style = self.get_style(sdict)
diff --git a/run_exps.py b/run_exps.py
index 4a2d8ab..dd75999 100755
--- a/run_exps.py
+++ b/run_exps.py
@@ -68,7 +68,7 @@ def convert_data(data):
             r"(?P<ENTRY>[\w\-\/]+)"
               r"\s*{\s*(?P<CONTENT>.*?)\s*?}$)|"
         r"(?P<SPIN>^"
-            r"(?:(?P<TYPE>[^\d\-]\w*?) )?\s*"
+            r"(?:(?P<TYPE>[^\d\-\s]\w*?) )?\s*"
             r"(?P<ARGS>[\w\-_\d\. \=]+)\s*$)",
         re.S|re.I|re.M)