From b3b0356a8f7c2b6602583ec60503126fc6540965 Mon Sep 17 00:00:00 2001
From: "Joshua E. Jodesty" <joshua.jodesty@gmail.com>
Date: Wed, 6 Mar 2019 15:11:25 -0500
Subject: [PATCH 1/5] moved config_sim

---
 cadCAD/configuration/utils/__init__.py       | 23 ++++++++++++++++++--
 cadCAD/configuration/utils/parameterSweep.py | 20 -----------------
 cadCAD/engine/simulation.py                  |  1 +
 simulations/validation/config1.py            |  3 +--
 simulations/validation/config2.py            |  4 ++--
 simulations/validation/config4.py            |  3 +--
 simulations/validation/sweep_config.py       |  3 +--
 7 files changed, 27 insertions(+), 30 deletions(-)
 delete mode 100644 cadCAD/configuration/utils/parameterSweep.py

diff --git a/cadCAD/configuration/utils/__init__.py b/cadCAD/configuration/utils/__init__.py
index d0d9aec..1ef09f3 100644
--- a/cadCAD/configuration/utils/__init__.py
+++ b/cadCAD/configuration/utils/__init__.py
@@ -6,7 +6,7 @@ import pandas as pd
 
 # Temporary
 from cadCAD.configuration.utils.depreciationHandler import sanitize_partial_state_updates
-from cadCAD.utils import dict_filter, contains_type
+from cadCAD.utils import dict_filter, contains_type, flatten_tabulated_dict, tabulate_dict
 
 
 # ToDo: Fix - Returns empty when partial_state_update is missing in Configuration
@@ -122,4 +122,23 @@ def exo_update_per_ts(ep):
         else:
             return y, s[y]
 
-    return {es: ep_decorator(f, es) for es, f in ep.items()}
\ No newline at end of file
+    return {es: ep_decorator(f, es) for es, f in ep.items()}
+
+
+# Param Sweep enabling middleware
+def config_sim(d):
+    def process_variables(d):
+        return flatten_tabulated_dict(tabulate_dict(d))
+
+    if "M" in d:
+        return [
+            {
+                "N": d["N"],
+                "T": d["T"],
+                "M": M
+            }
+            for M in process_variables(d["M"])
+        ]
+    else:
+        d["M"] = [{}]
+        return d
\ No newline at end of file
diff --git a/cadCAD/configuration/utils/parameterSweep.py b/cadCAD/configuration/utils/parameterSweep.py
deleted file mode 100644
index a91e938..0000000
--- a/cadCAD/configuration/utils/parameterSweep.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from cadCAD.utils import flatten_tabulated_dict, tabulate_dict
-
-
-def process_variables(d):
-    return flatten_tabulated_dict(tabulate_dict(d))
-
-
-def config_sim(d):
-    if "M" in d:
-        return [
-            {
-                "N": d["N"],
-                "T": d["T"],
-                "M": M
-            }
-            for M in process_variables(d["M"])
-        ]
-    else:
-        d["M"] = [{}]
-        return d
\ No newline at end of file
diff --git a/cadCAD/engine/simulation.py b/cadCAD/engine/simulation.py
index a62d1bb..9c3eeec 100644
--- a/cadCAD/engine/simulation.py
+++ b/cadCAD/engine/simulation.py
@@ -86,6 +86,7 @@ class Executor:
 
         self.apply_env_proc(env_processes, last_in_copy, last_in_copy['timestep'])
 
+        # ToDo: make 'substep' & 'timestep' reserve fields
         last_in_copy['substep'], last_in_copy['timestep'], last_in_copy['run'] = sub_step, time_step, run
 
         sL.append(last_in_copy)
diff --git a/simulations/validation/config1.py b/simulations/validation/config1.py
index 2c26f91..d2a8f2b 100644
--- a/simulations/validation/config1.py
+++ b/simulations/validation/config1.py
@@ -3,8 +3,7 @@ import numpy as np
 from datetime import timedelta
 
 from cadCAD.configuration import append_configs
-from cadCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step
-from cadCAD.configuration.utils.parameterSweep import config_sim
+from cadCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step, config_sim
 
 
 seeds = {
diff --git a/simulations/validation/config2.py b/simulations/validation/config2.py
index 0247c9b..80adcb5 100644
--- a/simulations/validation/config2.py
+++ b/simulations/validation/config2.py
@@ -3,8 +3,8 @@ import numpy as np
 from datetime import timedelta
 
 from cadCAD.configuration import append_configs
-from cadCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step
-from cadCAD.configuration.utils.parameterSweep import config_sim
+from cadCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step, config_sim
+
 
 seeds = {
     'z': np.random.RandomState(1),
diff --git a/simulations/validation/config4.py b/simulations/validation/config4.py
index 62f626f..164df26 100644
--- a/simulations/validation/config4.py
+++ b/simulations/validation/config4.py
@@ -3,8 +3,7 @@ import numpy as np
 from datetime import timedelta
 
 from cadCAD.configuration import append_configs
-from cadCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step
-from cadCAD.configuration.utils.parameterSweep import config_sim
+from cadCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step, config_sim
 
 
 seeds = {
diff --git a/simulations/validation/sweep_config.py b/simulations/validation/sweep_config.py
index 2350d95..e014b94 100644
--- a/simulations/validation/sweep_config.py
+++ b/simulations/validation/sweep_config.py
@@ -4,8 +4,7 @@ from datetime import timedelta
 import pprint
 
 from cadCAD.configuration import append_configs
-from cadCAD.configuration.utils import proc_trigger, ep_time_step
-from cadCAD.configuration.utils.parameterSweep import config_sim
+from cadCAD.configuration.utils import proc_trigger, ep_time_step, config_sim
 
 from typing import Dict, List
 

From 295968b71f8b85836466996cdbe00b6f28746d40 Mon Sep 17 00:00:00 2001
From: "Joshua E. Jodesty" <joshua.jodesty@gmail.com>
Date: Fri, 29 Mar 2019 09:29:41 -0400
Subject: [PATCH 2/5] cadCAD==0.2.1

---
 dist/cadCAD-0.2-py3-none-any.whl   | Bin 10811 -> 0 bytes
 dist/cadCAD-0.2.1-py3-none-any.whl | Bin 0 -> 11281 bytes
 setup.py                           |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 dist/cadCAD-0.2-py3-none-any.whl
 create mode 100644 dist/cadCAD-0.2.1-py3-none-any.whl

diff --git a/dist/cadCAD-0.2-py3-none-any.whl b/dist/cadCAD-0.2-py3-none-any.whl
deleted file mode 100644
index eb56bb3e2e006e18ecc452735178216f7508f3ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10811
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

diff --git a/dist/cadCAD-0.2.1-py3-none-any.whl b/dist/cadCAD-0.2.1-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..354aaec7a1da3c9b9123df1e1b02f0742b95e1fb
GIT binary patch
literal 11281
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

literal 0
HcmV?d00001

diff --git a/setup.py b/setup.py
index a01f39c..c27fef1 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ long_description = "cadCAD is a differential games based simulation software pac
     monte carlo analysis and other common numerical methods is provided."
 
 setup(name='cadCAD',
-      version='0.2',
+      version='0.2.1',
       description="cadCAD: a differential games based simulation software package for research, validation, and \
         Computer Aided Design of economic systems",
       long_description=long_description,

From c9ecf54d0d28ae4a009a1c056657876ff5ca171e Mon Sep 17 00:00:00 2001
From: "Joshua E. Jodesty" <joshua.jodesty@gmail.com>
Date: Fri, 29 Mar 2019 10:36:33 -0400
Subject: [PATCH 3/5] cadCAD==0.2.1 clean

---
 simulations/validation/sweep_config.py | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/simulations/validation/sweep_config.py b/simulations/validation/sweep_config.py
index e014b94..c9c92ab 100644
--- a/simulations/validation/sweep_config.py
+++ b/simulations/validation/sweep_config.py
@@ -94,15 +94,12 @@ def es4p2(_g, step, sL, s, _input):
 ts_format = '%Y-%m-%d %H:%M:%S'
 t_delta = timedelta(days=0, minutes=0, seconds=1)
 def es5p2(_g, step, sL, s, _input):
-    y = 'timestep'
+    y = 'timestamp'
     x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta)
     return (y, x)
 
 
 # Environment States
-# @curried
-# def env_a(param, x):
-#     return x + param
 def env_a(x):
     return x
 def env_b(x):
@@ -115,7 +112,6 @@ genesis_states = {
     's2': Decimal(0.0),
     's3': Decimal(1.0),
     's4': Decimal(1.0),
-#     'timestep': '2018-10-01 15:16:24'
 }
 
 
@@ -123,26 +119,13 @@ genesis_states = {
 raw_exogenous_states = {
     "s3": es3p1,
     "s4": es4p2,
-#     "timestep": es5p2
 }
 
-
-# ToDo: make env proc trigger field agnostic
-# ToDo: input json into function renaming __name__
 triggered_env_b = proc_trigger(1, env_b)
 env_processes = {
-    "s3": env_a, #sweep(beta, env_a),
-    "s4": triggered_env_b #rename('parameterized', triggered_env_b) #sweep(beta, triggered_env_b)
+    "s3": env_a,
+    "s4": triggered_env_b
 }
-# parameterized_env_processes = parameterize_states(env_processes)
-#
-# pp.pprint(parameterized_env_processes)
-# exit()
-
-# ToDo: The number of values entered in sweep should be the # of config objs created,
-# not dependent on the # of times the sweep is applied
-# sweep exo_state func and point to exo-state in every other funtion
-# param sweep on genesis states
 
 partial_state_update_block = {
     "m1": {

From c05cb7ad057252d210bd803f85320f787a998298 Mon Sep 17 00:00:00 2001
From: "Joshua E. Jodesty" <joshua.jodesty@gmail.com>
Date: Fri, 29 Mar 2019 10:57:43 -0400
Subject: [PATCH 4/5] cadCAD==0.2.1 clean2

---
 simulations/validation/config1.py      | 8 ++++----
 simulations/validation/config2.py      | 8 ++++----
 simulations/validation/sweep_config.py | 4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/simulations/validation/config1.py b/simulations/validation/config1.py
index d2a8f2b..1a98822 100644
--- a/simulations/validation/config1.py
+++ b/simulations/validation/config1.py
@@ -79,8 +79,8 @@ def es4p2(_g, step, sL, s, _input):
 ts_format = '%Y-%m-%d %H:%M:%S'
 t_delta = timedelta(days=0, minutes=0, seconds=1)
 def es5p2(_g, step, sL, s, _input):
-    y = 'timestep'
-    x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta)
+    y = 'timestamp'
+    x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta)
     return (y, x)
 
 
@@ -99,14 +99,14 @@ genesis_states = {
     's2': Decimal(0.0),
     's3': Decimal(1.0),
     's4': Decimal(1.0),
-#     'timestep': '2018-10-01 15:16:24'
+    'timestamp': '2018-10-01 15:16:24'
 }
 
 
 raw_exogenous_states = {
     "s3": es3p1,
     "s4": es4p2,
-#     "timestep": es5p2
+    "timestamp": es5p2
 }
 
 
diff --git a/simulations/validation/config2.py b/simulations/validation/config2.py
index 80adcb5..ebba912 100644
--- a/simulations/validation/config2.py
+++ b/simulations/validation/config2.py
@@ -77,8 +77,8 @@ def es4p2(_g, step, sL, s, _input):
 ts_format = '%Y-%m-%d %H:%M:%S'
 t_delta = timedelta(days=0, minutes=0, seconds=1)
 def es5p2(_g, step, sL, s, _input):
-    y = 'timestep'
-    x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta)
+    y = 'timestamp'
+    x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta)
     return (y, x)
 
 
@@ -97,14 +97,14 @@ genesis_states = {
     's2': Decimal(0.0),
     's3': Decimal(1.0),
     's4': Decimal(1.0),
-#     'timestep': '2018-10-01 15:16:24'
+    'timestamp': '2018-10-01 15:16:24'
 }
 
 
 raw_exogenous_states = {
     "s3": es3p1,
     "s4": es4p2,
-#     "timestep": es5p2
+    "timestamp": es5p2
 }
 
 
diff --git a/simulations/validation/sweep_config.py b/simulations/validation/sweep_config.py
index c9c92ab..04f5698 100644
--- a/simulations/validation/sweep_config.py
+++ b/simulations/validation/sweep_config.py
@@ -95,7 +95,7 @@ ts_format = '%Y-%m-%d %H:%M:%S'
 t_delta = timedelta(days=0, minutes=0, seconds=1)
 def es5p2(_g, step, sL, s, _input):
     y = 'timestamp'
-    x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta)
+    x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta)
     return (y, x)
 
 
@@ -112,6 +112,7 @@ genesis_states = {
     's2': Decimal(0.0),
     's3': Decimal(1.0),
     's4': Decimal(1.0),
+    'timestamp': '2018-10-01 15:16:24'
 }
 
 
@@ -119,6 +120,7 @@ genesis_states = {
 raw_exogenous_states = {
     "s3": es3p1,
     "s4": es4p2,
+    'timestamp': es5p2
 }
 
 triggered_env_b = proc_trigger(1, env_b)

From 2387dc071ba02cf834b3d55b0157d923e5924567 Mon Sep 17 00:00:00 2001
From: "Joshua E. Jodesty" <joshua.jodesty@gmail.com>
Date: Fri, 29 Mar 2019 10:59:55 -0400
Subject: [PATCH 5/5] cadCAD==0.2.1 clean2

---
 dist/cadCAD-0.2.1-py3-none-any.whl | Bin 11281 -> 11281 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dist/cadCAD-0.2.1-py3-none-any.whl b/dist/cadCAD-0.2.1-py3-none-any.whl
index 354aaec7a1da3c9b9123df1e1b02f0742b95e1fb..cf618e8040cc62695bde4265ae6eb8386dcb2886 100644
GIT binary patch
delta 65
zcmbOjF)?DpRz;@#^3B^7&oKe%$?YmrnDWXe%c^>UL^D*gSwW&#wY));lC}p(GDkZA
J#M`GG3;;9$7vKN@

delta 65
zcmbOjF)?DpRz)V`tj*gM&oKe%$?YmrK$NViCrC6yHJcU0y{hF6qLj2fKva%)0EpVB
G9Si{Nj}@8#