diff --git a/engine/__pycache__/__init__.cpython-37.pyc b/engine/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..01f339d Binary files /dev/null and b/engine/__pycache__/__init__.cpython-37.pyc differ diff --git a/engine/__pycache__/configProcessor.cpython-37.pyc b/engine/__pycache__/configProcessor.cpython-37.pyc new file mode 100644 index 0000000..faa49be Binary files /dev/null and b/engine/__pycache__/configProcessor.cpython-37.pyc differ diff --git a/engine/__pycache__/mechanismExecutor.cpython-37.pyc b/engine/__pycache__/mechanismExecutor.cpython-37.pyc new file mode 100644 index 0000000..1a9ad37 Binary files /dev/null and b/engine/__pycache__/mechanismExecutor.cpython-37.pyc differ diff --git a/engine/__pycache__/run.cpython-37.pyc b/engine/__pycache__/run.cpython-37.pyc new file mode 100644 index 0000000..cddb38d Binary files /dev/null and b/engine/__pycache__/run.cpython-37.pyc differ diff --git a/engine/__pycache__/utils.cpython-37.pyc b/engine/__pycache__/utils.cpython-37.pyc new file mode 100644 index 0000000..4142993 Binary files /dev/null and b/engine/__pycache__/utils.cpython-37.pyc differ diff --git a/engine/mechanismExecutor.py b/engine/mechanismExecutor.py index 37fdab4..b3fe0f3 100644 --- a/engine/mechanismExecutor.py +++ b/engine/mechanismExecutor.py @@ -21,12 +21,8 @@ def mech_step(m_step, sL, state_funcs, behavior_funcs, env_processes, t_step): _input = getBehaviorInput(m_step, sL, last_in_obj, behavior_funcs) - # OLD: no bueno! Mutation Bad - # for f in state_funcs: - # f(m_step, sL, last_mut_obj, _input) - - # New - last_mut_obj = dict([ f(m_step, sL, last_mut_obj, _input) for f in state_funcs ]) + for f in state_funcs: + f(m_step, sL, last_mut_obj, _input) apply_env_proc(env_processes, last_mut_obj, last_mut_obj['timestamp']) diff --git a/test.py b/test.py index 43e5f85..21e3670 100644 --- a/test.py +++ b/test.py @@ -1,4 +1,2 @@ from engine import run -from tabulate import tabulate -result = run.main() -print(tabulate(result, headers='keys', tablefmt='psql')) \ No newline at end of file +run.main() \ No newline at end of file diff --git a/ui/config.py b/ui/config.py index 956bfcd..0a23d3d 100644 --- a/ui/config.py +++ b/ui/config.py @@ -29,47 +29,29 @@ def b2m3(step, sL, s): # Internal States per Mechanism def s1m1(step, sL, s, _input): - y = 's1' - x = s['s1'] + _input - return (y, x) + s['s1'] = s['s1'] + _input def s2m1(step, sL, s, _input): - y = 's2' - x = s['s2'] + _input - return (y, x) + s['s2'] = s['s2'] + _input def s1m2(step, sL, s, _input): - y = 's1' - x = s['s1'] + _input - return (y, x) + s['s1'] = s['s1'] + _input def s2m2(step, sL, s, _input): - y = 's2' - x = s['s2'] + _input - return (y, x) + s['s2'] = s['s2'] + _input def s1m3(step, sL, s, _input): - y = 's1' - x = s['s1'] + _input - return (y, x) + s['s1'] = s['s1'] + _input def s2m3(step, sL, s, _input): - y = 's2' - x = s['s2'] + _input - return (y, x) + s['s2'] = s['s2'] + _input # Exogenous States proc_one_coef_A = 0.7 proc_one_coef_B = 1.3 def es3p1(step, sL, s, _input): - y = 's3' - x = s['s3'] * bound_norm_random(seed['a'], proc_one_coef_A, proc_one_coef_B) - return (y, x) + s['s3'] = s['s3'] * bound_norm_random(seed['a'], proc_one_coef_A, proc_one_coef_B) def es4p2(step, sL, s, _input): - y = 's4' - x = s['s4'] * bound_norm_random(seed['b'], proc_one_coef_A, proc_one_coef_B) - return (y, x) + s['s4'] = s['s4'] * bound_norm_random(seed['b'], proc_one_coef_A, proc_one_coef_B) def es5p2(step, sL, s, _input): # accept timedelta instead of timedelta params - y = 'timestamp' - x = ep_time_step(s, s['timestamp'], seconds=1) - return (y, x) + s['timestamp'] = ep_time_step(s, s['timestamp'], seconds=1) # Environment States def env_a(x):