jeffemmett
/
cadCAD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vacay cleanup

This commit is contained in:
Joshua E. Jodesty 2018-10-27 14:39:34 +02:00
parent 4df2b8cdc9
commit b4f4bc8b96
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/mechanismExecutor.py
View File

@ -21,11 +21,6 @@ def mech_step(m_step, sL, state_funcs, behavior_funcs, env_processes, t_step):
_input = getBehaviorInput(m_step, sL, last_in_obj, behavior_funcs) _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 ]) last_mut_obj = dict([ f(m_step, sL, last_mut_obj, _input) for f in state_funcs ])
apply_env_proc(env_processes, last_mut_obj, last_mut_obj['timestamp']) apply_env_proc(env_processes, last_mut_obj, last_mut_obj['timestamp'])

5
engine/run.py
View File

@ -10,10 +10,11 @@ def main():
states_list = [state_dict] states_list = [state_dict]
configs = generate_config(mechanisms, exogenous_states) configs = generate_config(mechanisms, exogenous_states)
# p = pipeline(states_list, configs, env_processes, range(10)) # p = pipeline(states_list, configs, env_processes, range(10))
T = range(5)
N = sim_config['N'] N = sim_config['N']
r = range(5)
# Dimensions: N x r x mechs # Dimensions: N x r x mechs
s = simulation(states_list, configs, env_processes, r, N) s = simulation(states_list, configs, env_processes, T, N)
result = pd.DataFrame(flatten(s)) result = pd.DataFrame(flatten(s))
print('Test') print('Test')
# print(tabulate(result, headers='keys', tablefmt='psql')) # print(tabulate(result, headers='keys', tablefmt='psql'))

1
engine/utils.py
View File

@ -27,6 +27,7 @@ def last_index(l):
def retrieve_state(l, offset): def retrieve_state(l, offset):
return l[last_index(l) + offset + 1] return l[last_index(l) + offset + 1]
# shouldn't
def bound_norm_random(rng, low, high): def bound_norm_random(rng, low, high):
# Add RNG Seed # Add RNG Seed
res = rng.normal((high+low)/2,(high-low)/6) res = rng.normal((high+low)/2,(high-low)/6)