From 50e4a38df7e1fbbf9073559baf71a80eeadac5a3 Mon Sep 17 00:00:00 2001
From: "Joshua E. Jodesty" <joshua.jodesty@gmail.com>
Date: Thu, 14 Feb 2019 20:05:46 -0500
Subject: [PATCH] rename hell

---
 .gitignore                                       |   2 ++
 README.md                                        |   2 +-
 SimCAD/__init__.py                               |   2 --
 cadCAD/__init__.py                               |   2 ++
 {SimCAD => cadCAD}/configuration/__init__.py     |  12 ++++++------
 .../configuration/utils/__init__.py              |   2 +-
 .../configuration/utils/parameterSweep.py        |   2 +-
 .../configuration/utils/policyAggregation.py     |   0
 {SimCAD => cadCAD}/engine/__init__.py            |   8 ++++----
 {SimCAD => cadCAD}/engine/simulation.py          |   4 ++--
 {SimCAD => cadCAD}/engine/utils.py               |   0
 {SimCAD => cadCAD}/utils/__init__.py             |   0
 dist/SimCAD-0.1-py3-none-any.whl                 | Bin 7445 -> 0 bytes
 dist/cadCAD-0.1-py3-none-any.whl                 | Bin 0 -> 9794 bytes
 setup.py                                         |  10 +++++-----
 simulations/example_run.py                       |   4 ++--
 simulations/validation/config1.py                |  14 +++++++-------
 simulations/validation/config2.py                |  14 +++++++-------
 simulations/validation/sweep_config.py           |  14 +++++++-------
 19 files changed, 47 insertions(+), 45 deletions(-)
 delete mode 100644 SimCAD/__init__.py
 create mode 100644 cadCAD/__init__.py
 rename {SimCAD => cadCAD}/configuration/__init__.py (92%)
 rename {SimCAD => cadCAD}/configuration/utils/__init__.py (98%)
 rename {SimCAD => cadCAD}/configuration/utils/parameterSweep.py (84%)
 rename {SimCAD => cadCAD}/configuration/utils/policyAggregation.py (100%)
 rename {SimCAD => cadCAD}/engine/__init__.py (94%)
 rename {SimCAD => cadCAD}/engine/simulation.py (97%)
 rename {SimCAD => cadCAD}/engine/utils.py (100%)
 rename {SimCAD => cadCAD}/utils/__init__.py (100%)
 delete mode 100644 dist/SimCAD-0.1-py3-none-any.whl
 create mode 100644 dist/cadCAD-0.1-py3-none-any.whl

diff --git a/.gitignore b/.gitignore
index b70d197..27a58c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ results
 *.csv
 *.txt
 simulations/.ipynb_checkpoints
+dist/*.gz
+cadCAD.egg-info
 
 build
 SimCAD.egg-info
\ No newline at end of file
diff --git a/README.md b/README.md
index 825c846..b591f72 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ SimCAD is written in Python 3.
 ```bash
 pip3 install -r requirements.txt
 python3 setup.py sdist bdist_wheel
-pip3 install dist/SimCAD-0.1-py3-none-any.whl
+pip3 install dist/cadCAD-0.1-py3-none-any.whl
 ```
 
 **2. Configure Simulation:**
diff --git a/SimCAD/__init__.py b/SimCAD/__init__.py
deleted file mode 100644
index b4234cb..0000000
--- a/SimCAD/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-name = "SimCAD"
-configs = []
\ No newline at end of file
diff --git a/cadCAD/__init__.py b/cadCAD/__init__.py
new file mode 100644
index 0000000..ce0b0f9
--- /dev/null
+++ b/cadCAD/__init__.py
@@ -0,0 +1,2 @@
+name = "cadCAD"
+configs = []
\ No newline at end of file
diff --git a/SimCAD/configuration/__init__.py b/cadCAD/configuration/__init__.py
similarity index 92%
rename from SimCAD/configuration/__init__.py
rename to cadCAD/configuration/__init__.py
index 1440b54..277ffce 100644
--- a/SimCAD/configuration/__init__.py
+++ b/cadCAD/configuration/__init__.py
@@ -2,15 +2,15 @@ from functools import reduce
 from fn.op import foldr
 import pandas as pd
 
-from SimCAD import configs
-from SimCAD.utils import key_filter
-from SimCAD.configuration.utils.policyAggregation import dict_elemwise_sum
-from SimCAD.configuration.utils import exo_update_per_ts
+from cadCAD import configs
+from cadCAD.utils import key_filter
+from cadCAD.configuration.utils.policyAggregation import dict_elemwise_sum
+from cadCAD.configuration.utils import exo_update_per_ts
 
 
 class Configuration(object):
-    def __init__(self, sim_config=None, initial_state=None, seeds=None, env_processes=None,
-                 exogenous_states=None, partial_state_updates=None, policy_ops=[foldr(dict_elemwise_sum())]):
+    def __init__(self, sim_config={}, initial_state={}, seeds={}, env_processes={},
+                 exogenous_states={}, partial_state_updates={}, policy_ops=[foldr(dict_elemwise_sum())], **kwargs):
         self.sim_config = sim_config
         self.initial_state = initial_state
         self.seeds = seeds
diff --git a/SimCAD/configuration/utils/__init__.py b/cadCAD/configuration/utils/__init__.py
similarity index 98%
rename from SimCAD/configuration/utils/__init__.py
rename to cadCAD/configuration/utils/__init__.py
index ab5113d..084f7ae 100644
--- a/SimCAD/configuration/utils/__init__.py
+++ b/cadCAD/configuration/utils/__init__.py
@@ -4,7 +4,7 @@ from copy import deepcopy
 from fn.func import curried
 import pandas as pd
 
-from SimCAD.utils import dict_filter, contains_type
+from cadCAD.utils import dict_filter, contains_type
 
 
 class TensorFieldReport:
diff --git a/SimCAD/configuration/utils/parameterSweep.py b/cadCAD/configuration/utils/parameterSweep.py
similarity index 84%
rename from SimCAD/configuration/utils/parameterSweep.py
rename to cadCAD/configuration/utils/parameterSweep.py
index 7d5024c..9e5d6ab 100644
--- a/SimCAD/configuration/utils/parameterSweep.py
+++ b/cadCAD/configuration/utils/parameterSweep.py
@@ -1,4 +1,4 @@
-from SimCAD.utils import flatten_tabulated_dict, tabulate_dict
+from cadCAD.utils import flatten_tabulated_dict, tabulate_dict
 
 
 def process_variables(d):
diff --git a/SimCAD/configuration/utils/policyAggregation.py b/cadCAD/configuration/utils/policyAggregation.py
similarity index 100%
rename from SimCAD/configuration/utils/policyAggregation.py
rename to cadCAD/configuration/utils/policyAggregation.py
diff --git a/SimCAD/engine/__init__.py b/cadCAD/engine/__init__.py
similarity index 94%
rename from SimCAD/engine/__init__.py
rename to cadCAD/engine/__init__.py
index 139d126..5a1d4ad 100644
--- a/SimCAD/engine/__init__.py
+++ b/cadCAD/engine/__init__.py
@@ -1,9 +1,9 @@
 from pathos.multiprocessing import ProcessingPool as Pool
 
-from SimCAD.utils import flatten
-from SimCAD.configuration import Processor
-from SimCAD.configuration.utils import TensorFieldReport
-from SimCAD.engine.simulation import Executor as SimExecutor
+from cadCAD.utils import flatten
+from cadCAD.configuration import Processor
+from cadCAD.configuration.utils import TensorFieldReport
+from cadCAD.engine.simulation import Executor as SimExecutor
 
 
 class ExecutionMode:
diff --git a/SimCAD/engine/simulation.py b/cadCAD/engine/simulation.py
similarity index 97%
rename from SimCAD/engine/simulation.py
rename to cadCAD/engine/simulation.py
index 4d855b1..9e3a153 100644
--- a/SimCAD/engine/simulation.py
+++ b/cadCAD/engine/simulation.py
@@ -1,7 +1,7 @@
 from copy import deepcopy
 from fn.op import foldr, call
 
-from SimCAD.engine.utils import engine_exception
+from cadCAD.engine.utils import engine_exception
 
 id_exception = engine_exception(KeyError, KeyError, None)
 
@@ -49,7 +49,7 @@ class Executor:
 
         del last_in_obj
 
-        self.apply_env_proc(env_processes, last_in_copy, last_in_copy['timestamp'])
+        self.apply_env_proc(env_processes, last_in_copy, last_in_copy['timestep']) # not time_step
 
         last_in_copy["sub_step"], last_in_copy["time_step"], last_in_copy['run'] = sub_step, time_step, run
         sL.append(last_in_copy)
diff --git a/SimCAD/engine/utils.py b/cadCAD/engine/utils.py
similarity index 100%
rename from SimCAD/engine/utils.py
rename to cadCAD/engine/utils.py
diff --git a/SimCAD/utils/__init__.py b/cadCAD/utils/__init__.py
similarity index 100%
rename from SimCAD/utils/__init__.py
rename to cadCAD/utils/__init__.py
diff --git a/dist/SimCAD-0.1-py3-none-any.whl b/dist/SimCAD-0.1-py3-none-any.whl
deleted file mode 100644
index d6a18cf3b4ece9d96dc8275acf765fab7dcc56cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

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

literal 0
HcmV?d00001

diff --git a/setup.py b/setup.py
index 619744d..ab1c80c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-long_description = "SimCAD is a differential games based simulation software package for research, validation, and \
+long_description = "cadCAD is a differential games based simulation software package for research, validation, and \
     Computer Aided Design of economic systems. An economic system is treated as a state based model and defined through \
     a set of endogenous and exogenous state variables which are updated through mechanisms and environmental processes, \
     respectively. Behavioral models, which may be deterministic or stochastic, provide the evolution of the system \
@@ -10,14 +10,14 @@ long_description = "SimCAD is a differential games based simulation software pac
     processes to understand and visualize network behavior under various conditions. Support for A/B testing policies, \
     monte carlo analysis and other common numerical methods is provided."
 
-setup(name='SimCAD',
+setup(name='cadCAD',
       version='0.1',
-      description="SimCAD: a differential games based simulation software package for research, validation, and \
+      description="cadCAD: a differential games based simulation software package for research, validation, and \
         Computer Aided Design of economic systems",
       long_description = long_description,
-      url='https://github.com/BlockScience/DiffyQ-SimCAD',
+      url='https://github.com/BlockScience/DiffyQ-cadCAD',
       author='Joshua E. Jodesty',
       author_email='joshua@block.science',
       # license='LICENSE',
-      packages=find_packages() #['SimCAD']
+      packages=find_packages()
 )
diff --git a/simulations/example_run.py b/simulations/example_run.py
index b179e49..3c80d44 100644
--- a/simulations/example_run.py
+++ b/simulations/example_run.py
@@ -1,9 +1,9 @@
 import pandas as pd
 from tabulate import tabulate
 # The following imports NEED to be in the exact order
-from SimCAD.engine import ExecutionMode, ExecutionContext, Executor
+from cadCAD.engine import ExecutionMode, ExecutionContext, Executor
 from simulations.validation import sweep_config, config1, config2
-from SimCAD import configs
+from cadCAD import configs
 
 exec_mode = ExecutionMode()
 
diff --git a/simulations/validation/config1.py b/simulations/validation/config1.py
index ce74604..4539208 100644
--- a/simulations/validation/config1.py
+++ b/simulations/validation/config1.py
@@ -2,9 +2,9 @@ from decimal import Decimal
 import numpy as np
 from datetime import timedelta
 
-from SimCAD.configuration import append_configs
-from SimCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step
-from SimCAD.configuration.utils.parameterSweep import config_sim
+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
 
 
 seeds = {
@@ -78,8 +78,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 = 'timestamp'
-    x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta)
+    y = 'timestep'
+    x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta)
     return (y, x)
 
 
@@ -98,14 +98,14 @@ genesis_states = {
     's2': Decimal(0.0),
     's3': Decimal(1.0),
     's4': Decimal(1.0),
-    'timestamp': '2018-10-01 15:16:24'
+    'timestep': '2018-10-01 15:16:24'
 }
 
 
 raw_exogenous_states = {
     "s3": es3p1,
     "s4": es4p2,
-    "timestamp": es5p2
+    "timestep": es5p2
 }
 
 
diff --git a/simulations/validation/config2.py b/simulations/validation/config2.py
index 987e8c0..5925c6c 100644
--- a/simulations/validation/config2.py
+++ b/simulations/validation/config2.py
@@ -2,9 +2,9 @@ from decimal import Decimal
 import numpy as np
 from datetime import timedelta
 
-from SimCAD.configuration import append_configs
-from SimCAD.configuration.utils import proc_trigger, bound_norm_random, ep_time_step
-from SimCAD.configuration.utils.parameterSweep import config_sim
+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
 
 seeds = {
     'z': np.random.RandomState(1),
@@ -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 = 'timestamp'
-    x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta)
+    y = 'timestep'
+    x = ep_time_step(s, dt_str=s['timestep'], 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),
-    'timestamp': '2018-10-01 15:16:24'
+    'timestep': '2018-10-01 15:16:24'
 }
 
 
 raw_exogenous_states = {
     "s3": es3p1,
     "s4": es4p2,
-    "timestamp": es5p2
+    "timestep": es5p2
 }
 
 
diff --git a/simulations/validation/sweep_config.py b/simulations/validation/sweep_config.py
index c93a703..f23e4ba 100644
--- a/simulations/validation/sweep_config.py
+++ b/simulations/validation/sweep_config.py
@@ -3,9 +3,9 @@ import numpy as np
 from datetime import timedelta
 import pprint
 
-from SimCAD.configuration import append_configs
-from SimCAD.configuration.utils import proc_trigger, ep_time_step
-from SimCAD.configuration.utils.parameterSweep import config_sim
+from cadCAD.configuration import append_configs
+from cadCAD.configuration.utils import proc_trigger, ep_time_step
+from cadCAD.configuration.utils.parameterSweep import config_sim
 
 pp = pprint.PrettyPrinter(indent=4)
 
@@ -93,8 +93,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 = 'timestamp'
-    x = ep_time_step(s, dt_str=s['timestamp'], fromat_str=ts_format, _timedelta=t_delta)
+    y = 'timestep'
+    x = ep_time_step(s, dt_str=s['timestep'], fromat_str=ts_format, _timedelta=t_delta)
     return (y, x)
 
 
@@ -114,7 +114,7 @@ genesis_states = {
     's2': Decimal(0.0),
     's3': Decimal(1.0),
     's4': Decimal(1.0),
-    'timestamp': '2018-10-01 15:16:24'
+    'timestep': '2018-10-01 15:16:24'
 }
 
 
@@ -122,7 +122,7 @@ genesis_states = {
 raw_exogenous_states = {
     "s3": es3p1,
     "s4": es4p2,
-    "timestamp": es5p2
+    "timestep": es5p2
 }