Change format from [hard|soft]_pm.. to pm...

- Requested plot type (default hard rt) is specified through option
  --type
- Add overhead type in csv files as a comment
- Fix wrong compacting (columns shuffling)
- Minor fixes

1 files changed, 4 insertions, 7 deletions

diff --git a/compact_pm_ovd.py b/compact_pm_ovd.py
index 0a25e0c..3b646ca 100755
--- a/compact_pm_ovd.py
+++ b/compact_pm_ovd.py
@@ -18,11 +18,7 @@ def build_name(dirname, conf, wss_list):
     if dirname == '':
         dirname = '.'
     outname = dirname + '/'
-    if 'hard' in conf:
-        outname += 'hard'
-    else:
-        outname += 'soft'
-    outname += '_pm_plugin=' + conf['plugin'] + '_dist=' + conf['dist']
+    outname += 'pm_plugin=' + conf['plugin'] + '_dist=' + conf['dist']
     # atm we use only uniform for PM (we also use only light, but...)
     if 'light' in conf:
         outname += '_light'
@@ -64,8 +60,7 @@ class WSSCompactor():
         self.wss_list.sort()
         outname = build_name(dirname, conf, self.wss_list)
         csvf = open(outname, 'w')
-        csvf.write('# preemption and migration overhead for ' + \
-                conf['plugin'] + '\n')
+        csvf.write('# ' + conf['plugin'] + ' ' + conf['ovd'] + '\n')
 
         wstr = '# tssize, '
         for wss in self.wss_list:
@@ -82,6 +77,8 @@ class WSSCompactor():
             for value in self.ovhead_table[str(key)]:
                 if float(value) > 0:
                     wstr += value + ', '
+                else:
+                    wstr += '0.00000, '
             wstr = wstr[0:-2]
             csvf.write(wstr + '\n')