continued prep for announced release

simulator/args/args-sim

@@ -1,15 +1,16 @@
 -exprmnt exp-4
+-inputLib ./input
+-outputLib ./output
 -cp cp.yaml
 -cpInit cpInit.yaml
 -funcExec funcExec.yaml
 -devExec devExec.yaml
 -exp exp.yaml
 -map map.yaml
 -topo topo.yaml
--inputLib ./input
--outputLib ./output
+-msr msr.yaml
+-container 
 -trace trace.yaml
 -stop 100.0
--msr msr.yaml
 -rngseed 234545
 -tunits msec

simulator/output/results.yaml

@@ -1,25 +1,21 @@
-pces evaluation run at time 2024-12-16 04:52:05.546541
+pces evaluation run at time 2024-12-16 22:39:59.046202
 - exprmnt: exp-1
   measurements:
-  - index: 1
-    latency: 1.0840000000007421 (msec)
+  - latency: 1.0840000000007421 (msec)
     measurename: end2end
     waypoints: []
 - exprmnt: exp-2
   measurements:
-  - index: 1
-    latency: 24.84399999999914 (msec)
+  - latency: 24.84399999999914 (msec)
     measurename: end2end
     waypoints: []
 - exprmnt: exp-3
   measurements:
-  - index: 1
-    latency: 1.0790000000015425 (msec)
+  - latency: 1.0790000000015425 (msec)
     measurename: end2end
     waypoints: []
 - exprmnt: exp-4
   measurements:
-  - index: 1
-    latency: 24.838999999999942 (msec)
+  - latency: 24.838999999999942 (msec)
     measurename: end2end
     waypoints: []

simulator/run.py

@@ -159,9 +159,9 @@ def main():
         with open(os.path.join(argsDir,'args-sim-template'), 'r') as tf, open(os.path.join(argsDir,'args-sim'), 'w') as wf:
             wf.write('-exprmnt {}\n'.format(exprmntName))
 
-            tagPairs = [('-inputDir', './input'), ('-outputDir', './output'), ('-cp', 'cp.yaml'), ('-cpInit', 'cpInit.yaml'),
+            tagPairs = [('-inputLib', './input'), ('-outputLib', './output'), ('-cp', 'cp.yaml'), ('-cpInit', 'cpInit.yaml'),
                     ('-funcExec', 'funcExec.yaml'), ('-devExec', 'devExec.yaml'), ('-exp', 'exp.yaml'),('-map', 'map.yaml'),
-                        ('-topo', 'topo.yaml'), ('-msr', 'msrFile')]
+                        ('-topo', 'topo.yaml'), ('-msr', 'msr.yaml')]
 
             if containerTag is not None:
                 tagPairs.append(('-container', ''))
@@ -190,9 +190,9 @@ def main():
                     continue
                 elif pieces[0] == '-topo':
                     continue
-                elif pieces[0] == 'inputDir':
+                elif pieces[0] == 'inputLib':
                     continue
-                elif pieces[0] == 'outputDir':
+                elif pieces[0] == 'outputLib':
                     continue
                 else:      
                     wf.write(line)