From fb0c90124b0bd9fe5b096bd77ed0b63984e7ca7e Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Mon, 3 Dec 2018 12:32:22 -0500 Subject: [PATCH] rename 'sandbox' to 'simulation' --- SimCAD/__init__.py | 17 +---------- SimCAD/configuration/__init__.py | 14 ++++++++++ {sandbox => simulations}/barlin/config3.py | 4 +-- {sandbox => simulations}/barlin/config4.py | 3 +- {sandbox => simulations}/barlin/config5.py | 3 +- {sandbox => simulations}/barlin/config6.py | 3 +- {sandbox => simulations}/barlin/config6a.py | 3 +- .../barlin/config6atemp.py | 3 +- .../barlin/config6aworks.py | 3 +- {sandbox => simulations}/sim_test.py | 28 +++++++++---------- .../validation/config1.py | 3 +- .../validation/config2.py | 3 +- {sandbox => simulations}/zx/config_zx.py | 9 +++--- 13 files changed, 51 insertions(+), 45 deletions(-) rename {sandbox => simulations}/barlin/config3.py (98%) rename {sandbox => simulations}/barlin/config4.py (98%) rename {sandbox => simulations}/barlin/config5.py (98%) rename {sandbox => simulations}/barlin/config6.py (98%) rename {sandbox => simulations}/barlin/config6a.py (98%) rename {sandbox => simulations}/barlin/config6atemp.py (98%) rename {sandbox => simulations}/barlin/config6aworks.py (98%) rename {sandbox => simulations}/sim_test.py (53%) rename {sandbox => simulations}/validation/config1.py (97%) rename {sandbox => simulations}/validation/config2.py (97%) rename {sandbox => simulations}/zx/config_zx.py (92%) diff --git a/SimCAD/__init__.py b/SimCAD/__init__.py index 3b57d59..206f79c 100644 --- a/SimCAD/__init__.py +++ b/SimCAD/__init__.py @@ -1,16 +1 @@ -from fn.op import foldr -from SimCAD.configuration.utils.behaviorAggregation import dict_elemwise_sum - - -configs = [] - -#Configuration(sim_config, state_dict, seed, exogenous_states, env_processes, mechanisms) -class Configuration: - def __init__(self, sim_config, state_dict, seed, exogenous_states, env_processes, mechanisms, behavior_ops=[foldr(dict_elemwise_sum())]): - self.sim_config = sim_config - self.state_dict = state_dict - self.seed = seed - self.exogenous_states = exogenous_states - self.env_processes = env_processes - self.behavior_ops = behavior_ops - self.mechanisms = mechanisms \ No newline at end of file +configs = [] \ No newline at end of file diff --git a/SimCAD/configuration/__init__.py b/SimCAD/configuration/__init__.py index ad438bf..57593e4 100644 --- a/SimCAD/configuration/__init__.py +++ b/SimCAD/configuration/__init__.py @@ -1,6 +1,20 @@ from functools import reduce +from fn.op import foldr import pandas as pd + from SimCAD.utils import key_filter +from SimCAD.configuration.utils.behaviorAggregation import dict_elemwise_sum + +#Configuration(sim_config, state_dict, seed, exogenous_states, env_processes, mechanisms) +class Configuration: + def __init__(self, sim_config, state_dict, seed, exogenous_states, env_processes, mechanisms, behavior_ops=[foldr(dict_elemwise_sum())]): + self.sim_config = sim_config + self.state_dict = state_dict + self.seed = seed + self.exogenous_states = exogenous_states + self.env_processes = env_processes + self.behavior_ops = behavior_ops + self.mechanisms = mechanisms class Identity: def __init__(self, behavior_id={'indentity': 0}): diff --git a/sandbox/barlin/config3.py b/simulations/barlin/config3.py similarity index 98% rename from sandbox/barlin/config3.py rename to simulations/barlin/config3.py index 12c0db5..a63e3dd 100644 --- a/sandbox/barlin/config3.py +++ b/simulations/barlin/config3.py @@ -2,10 +2,10 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step - seed = { 'z': np.random.RandomState(1) } diff --git a/sandbox/barlin/config4.py b/simulations/barlin/config4.py similarity index 98% rename from sandbox/barlin/config4.py rename to simulations/barlin/config4.py index 9bcbf16..5a2ff83 100644 --- a/sandbox/barlin/config4.py +++ b/simulations/barlin/config4.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/barlin/config5.py b/simulations/barlin/config5.py similarity index 98% rename from sandbox/barlin/config5.py rename to simulations/barlin/config5.py index fc007dc..2c968c4 100644 --- a/sandbox/barlin/config5.py +++ b/simulations/barlin/config5.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/barlin/config6.py b/simulations/barlin/config6.py similarity index 98% rename from sandbox/barlin/config6.py rename to simulations/barlin/config6.py index 14b325a..ed2e774 100644 --- a/sandbox/barlin/config6.py +++ b/simulations/barlin/config6.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/barlin/config6a.py b/simulations/barlin/config6a.py similarity index 98% rename from sandbox/barlin/config6a.py rename to simulations/barlin/config6a.py index d213400..f8781d2 100644 --- a/sandbox/barlin/config6a.py +++ b/simulations/barlin/config6a.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/barlin/config6atemp.py b/simulations/barlin/config6atemp.py similarity index 98% rename from sandbox/barlin/config6atemp.py rename to simulations/barlin/config6atemp.py index 3343275..20e156b 100644 --- a/sandbox/barlin/config6atemp.py +++ b/simulations/barlin/config6atemp.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/barlin/config6aworks.py b/simulations/barlin/config6aworks.py similarity index 98% rename from sandbox/barlin/config6aworks.py rename to simulations/barlin/config6aworks.py index f3ff426..13621f0 100644 --- a/sandbox/barlin/config6aworks.py +++ b/simulations/barlin/config6aworks.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/sim_test.py b/simulations/sim_test.py similarity index 53% rename from sandbox/sim_test.py rename to simulations/sim_test.py index 8259068..5169e77 100644 --- a/sandbox/sim_test.py +++ b/simulations/sim_test.py @@ -2,10 +2,10 @@ import pandas as pd from tabulate import tabulate from SimCAD.engine import ExecutionMode, ExecutionContext, Executor -# from sandbox.validation import config1, config2 -# from sandbox.barlin import config4 -# from sandbox.zx import config_zx -from sandbox.barlin import config6atemp #config6aworks, +from simulations.validation import config1, config2 +# from simulations.barlin import config4 +# from simulations.zx import config_zx +# from simulations.barlin import config6atemp #config6aworks, from SimCAD import configs # ToDo: pass ExecutionContext with execution method as ExecutionContext input @@ -24,13 +24,13 @@ result = pd.DataFrame(run1_raw_result) print(tabulate(result, headers='keys', tablefmt='psql')) print() -# print("Simulation Run 2: Pairwise Execution") -# print() -# multi_proc_ctx = ExecutionContext(exec_mode.multi_proc) -# # configs = [config1, config1] -# run2 = Executor(multi_proc_ctx, configs) -# run2_raw_results = run2.main() -# for raw_result in run2_raw_results: -# result = pd.DataFrame(raw_result) -# print(tabulate(result, headers='keys', tablefmt='psql')) -# print() \ No newline at end of file +print("Simulation Run 2: Pairwise Execution") +print() +multi_proc_ctx = ExecutionContext(exec_mode.multi_proc) +# configs = [config1, config1] +run2 = Executor(multi_proc_ctx, configs) +run2_raw_results = run2.main() +for raw_result in run2_raw_results: + result = pd.DataFrame(raw_result) + print(tabulate(result, headers='keys', tablefmt='psql')) +print() \ No newline at end of file diff --git a/sandbox/validation/config1.py b/simulations/validation/config1.py similarity index 97% rename from sandbox/validation/config1.py rename to simulations/validation/config1.py index 7017dfe..665c77c 100644 --- a/sandbox/validation/config1.py +++ b/simulations/validation/config1.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/validation/config2.py b/simulations/validation/config2.py similarity index 97% rename from sandbox/validation/config2.py rename to simulations/validation/config2.py index 4d03faf..794b41e 100644 --- a/sandbox/validation/config2.py +++ b/simulations/validation/config2.py @@ -2,7 +2,8 @@ from decimal import Decimal import numpy as np from datetime import timedelta -from SimCAD import Configuration, configs +from SimCAD import configs +from SimCAD.configuration import Configuration from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step diff --git a/sandbox/zx/config_zx.py b/simulations/zx/config_zx.py similarity index 92% rename from sandbox/zx/config_zx.py rename to simulations/zx/config_zx.py index d17b523..01f97b1 100644 --- a/sandbox/zx/config_zx.py +++ b/simulations/zx/config_zx.py @@ -1,11 +1,10 @@ -from fn.op import foldr -from fn import _ - from decimal import Decimal import numpy as np +from datetime import timedelta -from SimCAD import Configuration, configs -from SimCAD.configuration import exo_update_per_ts, proc_trigger, bound_norm_random, \ +from SimCAD import configs +from SimCAD.configuration import Configuration +from SimCAD.configuration.utils import exo_update_per_ts, proc_trigger, bound_norm_random, \ ep_time_step seed = {