|
@@ -723,12 +723,18 @@ with open("calibration/averages", 'r') as param_file:
|
|
|
op = op.strip()
|
|
|
args[op] = float(t)
|
|
|
|
|
|
-model = System(**args)
|
|
|
-sim = Simulator(model)
|
|
|
-sim.setTerminationCondition(lambda t, m: m.mvi.state.finished)
|
|
|
-#sim.setVerbose()
|
|
|
-start = time.time()
|
|
|
-tn = sim.simulate()
|
|
|
-
|
|
|
-print("Simulation time %s" % tn)
|
|
|
-print("Execution time %s" % (time.time() - start))
|
|
|
+def simulate(supplied_args):
|
|
|
+ local_args = dict(args)
|
|
|
+ local_args.update(supplied_args)
|
|
|
+ model = System(**local_args)
|
|
|
+ sim = Simulator(model)
|
|
|
+ sim.setTerminationCondition(lambda t, m: m.mvi.state.finished)
|
|
|
+ #sim.setVerbose()
|
|
|
+ start = time.time()
|
|
|
+ tn = sim.simulate()
|
|
|
+ return (tn, time.time() - start)
|
|
|
+
|
|
|
+if __name__ == "__main__":
|
|
|
+ ts, te = simulate({})
|
|
|
+ print("Simulation time %s" % ts)
|
|
|
+ print("Execution time %s" % te)
|