Fixes to plot and make DEVS model take CLI parameters

model/model.py

@@ -735,6 +735,12 @@ def simulate(supplied_args):
     return (tn, time.time() - start)
 
 if __name__ == "__main__":
-    ts, te = simulate({})
+    import sys
+    args = {}
+    i = 2
+    while i < len(sys.argv):
+        args[sys.argv[i]] = float(sys.argv[i+1])
+        i += 2
+    ts, te = simulate(args)
     print("Simulation time %s" % ts)
     print("Execution time %s" % te)

model/plot

@@ -1,30 +1,31 @@
 reset
-set terminal postscript enhanced colour portrait size 6,6
+set terminal postscript enhanced colour portrait size 4,4
 
 set out 'model/mvs_latency_sweep.eps'
 set title "MvK to MvS latency simulation"
 set xlabel "MvS latency (ms)"
 set ylabel "Time (s)"
-plot 'model/results_mvs_latency' u 1:2 w l title "Execution time", '' u 1:3 w l title "Simulation time"
+plot 'model/results_mvs_latency' u 1:2 w l lw 3 title "Execution time"
 
 set out 'model/mvi_latency_sweep.eps'
 set title "MvI to MvK latency simulation"
 set xlabel "MvI latency (ms)"
 set ylabel "Time (s)"
-plot 'model/results_mvi_latency' u 1:2 w l title "Execution time", '' u 1:3 w l title "Simulation time"
+plot 'model/results_mvi_latency' u 1:2 w l lw 3 title "Execution time"
 
 set out 'model/mvs_latency_performance.eps'
 set title "MvK to MvS latency influence"
 set xlabel "MvS latency (ms)"
 set ylabel "Time (s)"
-plot 'model/results_mvs_latency' u 1:2 w l title "Execution time"
+plot 'model/results_mvs_latency' u 1:2 w l lw 3 title "Execution time", '' u 1:3 w l lw 3 title "Simulation time"
 
-set out 'model/mvk_latency_performance.eps'
+set out 'model/mvi_latency_performance.eps'
 set title "MvI to MvK latency influence"
 set xlabel "MvI latency (ms)"
 set ylabel "Time (s)"
-plot 'model/results_mvi_latency' u 1:2 w l title "Execution time"
+plot 'model/results_mvi_latency' u 1:2 w l lw 3 title "Execution time", '' u 1:3 w l lw 3 title "Simulation time"
 
+set terminal postscript enhanced colour portrait size 8,4
 set out 'model/execution_jitter.eps'
 set title "Execution time jitter"
 set xlabel "Execution time (s)"