1 files changed, 33 insertions, 3 deletions

diff --git a/assemble_files.py b/assemble_files.py
index f4be48f..75c6c07 100755
--- a/assemble_files.py
+++ b/assemble_files.py
@@ -8,6 +8,22 @@ from os.path  import splitext, basename
 from glob import glob
 from collections import defaultdict
 
+import optparse
+
+o = optparse.make_option
+
+opts = [
+    o('-s', '--split', action='store_true', dest='split_files',
+      help='split out files into individual per-wss files'),
+    ]
+
+
+defaults = {
+    'split_files' : False,
+    }
+
+options = None
+
 #G-EDF/testpoint_ucap=13.75_wss=1792_dist=exp-10-10-100_deadlines=implicit_host=ludwig_scheduler=G-EDF.csv
 
 def key(fname):
@@ -22,7 +38,12 @@ def key(fname):
     dl = 'deadlines=%s' % conf['deadlines']
     h  = 'host=%s'  % conf['host']
 
-    return '_'.join([d, dl, s, h]) + q
+    if options.split_files:
+        w = '_wss=%s' % conf['wss']
+    else:
+        w = ''
+
+    return '_'.join([d, dl, s, h]) + q + w
 
 def assemble_results(dir):
     files = glob(dir + '/*.csv')
@@ -33,10 +54,15 @@ def assemble_results(dir):
         k = key(f)
         parts[k].append(f)
 
+    if options.split_files:
+        nametag = 'dwss'
+    else:
+        nametag = 'dall'
+
     for i, k in enumerate(parts):
         comment = 1
         print '[%d/%d] Processing %s' % (i+ 1, len(parts), k)
-        out = open('sched_%s.csv' % k, 'w')
+        out = open('%s_%s.csv' % (nametag, k), 'w')
         for f in sorted(parts[k]):
             for line in open(f):
                 if line[0] != '#' or comment:
@@ -48,6 +74,10 @@ def assemble_results(dir):
 
 
 if __name__ == '__main__':
-    for d in sys.argv[1:]:
+    parser = optparse.OptionParser(option_list=opts)
+    parser.set_defaults(**defaults)
+    (options, dirs) = parser.parse_args()
+
+    for d in dirs:
         assemble_results(d)