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

changed proc_trigger to var_trigger in sweep test

This commit is contained in:
Joshua E. Jodesty 2019-05-16 16:33:53 -04:00
parent 2de989db0a
commit 7f28bae21a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
simulations/regression_tests/sweep_config.py
View File

@ -5,7 +5,7 @@ from funcy import compose
import pprint import pprint
from cadCAD.configuration import append_configs from cadCAD.configuration import append_configs
from cadCAD.configuration.utils import proc_trigger, env_trigger, var_substep_trigger, config_sim, env_proc_trigger, \ from cadCAD.configuration.utils import var_trigger, env_trigger, var_substep_trigger, config_sim, env_proc_trigger, \
time_step, psub_list time_step, psub_list
from typing import Dict, List from typing import Dict, List
@ -94,9 +94,9 @@ def update_timestamp(_g, step, sL, s, _input):
for m in ['m1','m2','m3']: for m in ['m1','m2','m3']:
# psu_block[m]["variables"]['timestamp'] = update_timestamp # psu_block[m]["variables"]['timestamp'] = update_timestamp
psu_block[m]["variables"]['timestamp'] = var_timestep_trigger(y='timestamp', f=update_timestamp) psu_block[m]["variables"]['timestamp'] = var_timestep_trigger(y='timestamp', f=update_timestamp)
# psu_block[m]["variables"]['timestamp'] = proc_trigger( psu_block[m]["variables"]['timestamp'] = var_trigger(
# y='timestamp', f=update_timestamp, pre_conditions={'substep': [0, system_substeps]}, cond_op=lambda a, b: a and b y='timestamp', f=update_timestamp, pre_conditions={'substep': [0, system_substeps]}, cond_op=lambda a, b: a and b
# ) )
proc_one_coef_A = 0.7 proc_one_coef_A = 0.7
def es3p1(_g, step, sL, s, _input): def es3p1(_g, step, sL, s, _input):
@ -128,7 +128,7 @@ genesis_states = {
# Environment Process # Environment Process
# ToDo: Validate - make env proc trigger field agnostic # ToDo: Validate - make env proc trigger field agnostic
env_process["s3"] = [lambda x: x + 1, lambda x: x + 1] env_process["s3"] = [lambda x: x + 1, lambda x: x + 1]
env_process["s4"] = env_timestep_trigger(trigger_field='timestep', trigger_vals=[5], funct_list=[lambda x: 1, lambda x: x + 2]) env_process["s4"] = env_timestep_trigger(trigger_field='field', trigger_vals=[5], funct_list=[lambda x: 1, lambda x: x + 2])
# config_sim Necessary # config_sim Necessary
@ -156,4 +156,3 @@ print("Policie State Update Block:")
pp.pprint(partial_state_update_blocks) pp.pprint(partial_state_update_blocks)
print() print()
print() print()