diff --git a/dist/cadCAD-0.2.4-py3-none-any.whl b/dist/cadCAD-0.2.4-py3-none-any.whl index 052468e..d8157ed 100644 Binary files a/dist/cadCAD-0.2.4-py3-none-any.whl and b/dist/cadCAD-0.2.4-py3-none-any.whl differ diff --git a/simulations/regression_tests/config1.py b/simulations/regression_tests/config1.py index 33faabf..9ee1979 100644 --- a/simulations/regression_tests/config1.py +++ b/simulations/regression_tests/config1.py @@ -3,9 +3,7 @@ from datetime import timedelta from cadCAD.configuration import append_configs -from cadCAD.configuration.utils import env_proc_trigger, bound_norm_random, ep_time_step, config_sim, time_step, \ - env_trigger - +from cadCAD.configuration.utils import bound_norm_random, config_sim, time_step, env_trigger seeds = { 'z': np.random.RandomState(1), @@ -154,8 +152,6 @@ sim_config = config_sim( append_configs( sim_configs=sim_config, initial_state=genesis_states, - # seeds=seeds, - # raw_exogenous_states=raw_exogenous_states, env_processes=env_processes, partial_state_update_blocks=partial_state_update_blocks, policy_ops=[lambda a, b: a + b] diff --git a/simulations/regression_tests/config2.py b/simulations/regression_tests/config2.py index 3962f76..e120285 100644 --- a/simulations/regression_tests/config2.py +++ b/simulations/regression_tests/config2.py @@ -2,8 +2,7 @@ import numpy as np from datetime import timedelta from cadCAD.configuration import append_configs -from cadCAD.configuration.utils import env_proc_trigger, bound_norm_random, ep_time_step, config_sim, env_trigger, \ - time_step +from cadCAD.configuration.utils import bound_norm_random, config_sim, env_trigger, time_step seeds = { 'z': np.random.RandomState(1), @@ -142,7 +141,6 @@ sim_config = config_sim( append_configs( sim_configs=sim_config, initial_state=genesis_states, - seeds=seeds, env_processes=env_processes, partial_state_update_blocks=partial_state_update_block ) \ No newline at end of file diff --git a/simulations/regression_tests/external_dataset.py b/simulations/regression_tests/external_dataset.py index 32fd6e6..0265288 100644 --- a/simulations/regression_tests/external_dataset.py +++ b/simulations/regression_tests/external_dataset.py @@ -62,9 +62,6 @@ sim_config = config_sim({ append_configs( sim_configs=sim_config, initial_state=state_dict, - # seeds=seeds, - # raw_exogenous_states=raw_exogenous_states, - # env_processes=env_processes, partial_state_update_blocks=partial_state_update_blocks, policy_ops=[lambda a, b: {**a, **b}] ) diff --git a/simulations/regression_tests/policy_aggregation.py b/simulations/regression_tests/policy_aggregation.py index 35d4745..f5e3916 100644 --- a/simulations/regression_tests/policy_aggregation.py +++ b/simulations/regression_tests/policy_aggregation.py @@ -3,14 +3,6 @@ from cadCAD.configuration import append_configs from cadCAD.configuration.utils import config_sim -seeds = { - 'z': np.random.RandomState(1), - 'a': np.random.RandomState(2), - 'b': np.random.RandomState(3), - 'c': np.random.RandomState(3) -} - - # Policies per Mechanism def p1m1(_g, step, sL, s): return {'policy1': 1} @@ -48,8 +40,6 @@ variables = { 's1': add('s1', 1), "policies": policies } -# test_varablies = deepcopy(variables) -# test_varablies['test'] = test partial_state_update_block = { "m1": { @@ -91,7 +81,6 @@ sim_config = config_sim( append_configs( sim_configs=sim_config, initial_state=genesis_states, - seeds=seeds, partial_state_update_blocks=partial_state_update_block, policy_ops=[lambda a, b: a + b, lambda y: y * 2] # Default: lambda a, b: a + b ToDO: reduction function requires high lvl explanation ) \ No newline at end of file diff --git a/simulations/regression_tests/sweep_config.py b/simulations/regression_tests/sweep_config.py index ef7885c..2503529 100644 --- a/simulations/regression_tests/sweep_config.py +++ b/simulations/regression_tests/sweep_config.py @@ -1,11 +1,9 @@ -from decimal import Decimal import numpy as np from datetime import timedelta import pprint from cadCAD.configuration import append_configs -from cadCAD.configuration.utils import var_trigger, env_trigger, var_substep_trigger, config_sim, env_proc_trigger, \ - time_step, psub_list +from cadCAD.configuration.utils import env_trigger, var_substep_trigger, config_sim, time_step, psub_list from typing import Dict, List diff --git a/simulations/regression_tests/udo.py b/simulations/regression_tests/udo.py index e71ad13..02647e7 100644 --- a/simulations/regression_tests/udo.py +++ b/simulations/regression_tests/udo.py @@ -1,19 +1,13 @@ -from copy import deepcopy +import pandas as pd +from fn.func import curried from datetime import timedelta -from functools import reduce +import pprint as pp from cadCAD.utils import SilentDF #, val_switch from cadCAD.configuration import append_configs -from cadCAD.configuration.utils import time_step, config_sim, var_trigger, var_substep_trigger, genereate_psubs, \ - env_trigger, psub_list +from cadCAD.configuration.utils import time_step, config_sim, var_trigger, var_substep_trigger, env_trigger, psub_list from cadCAD.configuration.utils.userDefinedObject import udoPipe, UDO -import pandas as pd -from fn.func import curried - -import pprint as pp - -from cadCAD.utils.sys_config import add DF = SilentDF(pd.read_csv('/Users/jjodesty/Projects/DiffyQ-SimCAD/simulations/external_data/output.csv')) diff --git a/simulations/regression_tests/udo_inter_substep_update.py b/simulations/regression_tests/udo_inter_substep_update.py index 0e4ffc9..c713b92 100644 --- a/simulations/regression_tests/udo_inter_substep_update.py +++ b/simulations/regression_tests/udo_inter_substep_update.py @@ -1,12 +1,13 @@ -from copy import deepcopy -from datetime import timedelta -from cadCAD.utils import SilentDF #, val_switch -from cadCAD.configuration import append_configs -from cadCAD.configuration.utils import time_step, ep_time_step, config_sim -from cadCAD.configuration.utils.userDefinedObject import udoPipe, UDO import pandas as pd import pprint as pp from fn.func import curried +from datetime import timedelta + +from cadCAD.utils import SilentDF #, val_switch +from cadCAD.configuration import append_configs +from cadCAD.configuration.utils import time_step, config_sim +from cadCAD.configuration.utils.userDefinedObject import udoPipe, UDO + DF = SilentDF(pd.read_csv('/Users/jjodesty/Projects/DiffyQ-SimCAD/simulations/external_data/output.csv')) diff --git a/simulations/test_executions/config2_test.py b/simulations/test_executions/config2_test.py index e6c349e..6c12b09 100644 --- a/simulations/test_executions/config2_test.py +++ b/simulations/test_executions/config2_test.py @@ -10,7 +10,6 @@ exec_mode = ExecutionMode() print("Simulation Execution: Single Configuration") print() first_config = configs # only contains config2 -# print(configs[0].env_processes) single_proc_ctx = ExecutionContext(context=exec_mode.single_proc) run = Executor(exec_context=single_proc_ctx, configs=first_config) diff --git a/simulations/test_executions/param_sweep_test.py b/simulations/test_executions/param_sweep_test.py index a7e736c..51c1d46 100644 --- a/simulations/test_executions/param_sweep_test.py +++ b/simulations/test_executions/param_sweep_test.py @@ -1,5 +1,3 @@ -from pprint import pprint - import pandas as pd from tabulate import tabulate # The following imports NEED to be in the exact order