From cccb491f2c875776e8d15d83ad5e35c32c301798 Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Tue, 12 Feb 2019 21:13:08 -0500 Subject: [PATCH] temp parama sweep --- SimCAD/engine/simulation.py | 4 ++-- simulations/validation/config1.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SimCAD/engine/simulation.py b/SimCAD/engine/simulation.py index 0d8de63..7c1f5bc 100644 --- a/SimCAD/engine/simulation.py +++ b/SimCAD/engine/simulation.py @@ -34,13 +34,13 @@ class Executor: def mech_step(self, m_step, sL, state_funcs, behavior_funcs, env_processes, t_step, run): last_in_obj = sL[-1] - _input = self.state_update_exception(self.get_behavior_input(m_step, sL, last_in_obj, behavior_funcs)) + _input = self.behavior_update_exception(self.get_behavior_input(m_step, sL, last_in_obj, behavior_funcs)) # print(_input) # ToDo: add env_proc generator to `last_in_copy` iterator as wrapper function last_in_copy = dict( [ - self.behavior_update_exception(curry_pot(f, m_step, sL, last_in_obj, _input)) for f in state_funcs + self.state_update_exception(curry_pot(f, m_step, sL, last_in_obj, _input)) for f in state_funcs ] ) diff --git a/simulations/validation/config1.py b/simulations/validation/config1.py index 2464b47..9ad579c 100644 --- a/simulations/validation/config1.py +++ b/simulations/validation/config1.py @@ -17,7 +17,7 @@ seed = { # beta = 1 -#middleware(f1,f2,f3,f4) +# middleware(f1,f2,f3,f4) # Behaviors per Mechanism def b1m1(step, sL, s): @@ -165,7 +165,7 @@ mechanisms = { "m3": { "behaviors": { "b1": b1m3, - "b2": b2m3, + "b2": b2m3 }, "states": { "s1": s1m3, @@ -188,4 +188,4 @@ append_configs( env_processes=env_processes, mechanisms=mechanisms, _exo_update_per_ts=True #Default -) +) \ No newline at end of file