diff --git a/.gitignore b/.gitignore index a9e45ba..5e2a723 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ results simulations/.ipynb_checkpoints build -SimCAD.egg-info \ No newline at end of file +cadCAD.egg-info +SimCAD.egg-info diff --git a/README.md b/README.md index 289fd4b..20056a1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Aided Design of economic systems. An economic system is treated as a state based 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 within the action space of the mechanisms. Mathematical formulations of these economic games \ -treat agent utility as derived from state rather than direct from action, creating a rich dynamic modeling framework. +treat agent utility as derived from state rather than direct from action, creating a rich dynamic modeling framework. Simulations may be run with a range of initial conditions and parameters for states, behaviors, mechanisms, \ and environmental processes to understand and visualize network behavior under various conditions. Support for \ @@ -21,7 +21,7 @@ SimCAD is written in Python 3. ```bash pip install -r requirements.txt python3 setup.py sdist bdist_wheel -pip install dist/SimCAD-0.1-py3-none-any.whl +pip install dist/cadCAD-0.2-py3-none-any.whl ``` **2. Configure Simulation:** @@ -76,7 +76,7 @@ for raw_result, tensor_field in run2.main(): print() ``` -The above can be run in Jupyter. +The above can be run in Jupyter. ```bash jupyter notebook ``` diff --git a/SimCAD/__init__.py b/SimCAD/__init__.py deleted file mode 100644 index 0b7fa28..0000000 --- a/SimCAD/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -name = "SimCAD" -configs = [] diff --git a/cadCAD/__init__.py b/cadCAD/__init__.py new file mode 100644 index 0000000..61e8d6d --- /dev/null +++ b/cadCAD/__init__.py @@ -0,0 +1,2 @@ +name = "cadCAD" +configs = [] diff --git a/SimCAD/configuration/__init__.py b/cadCAD/configuration/__init__.py similarity index 97% rename from SimCAD/configuration/__init__.py rename to cadCAD/configuration/__init__.py index bc911e4..27cafdc 100644 --- a/SimCAD/configuration/__init__.py +++ b/cadCAD/configuration/__init__.py @@ -2,8 +2,8 @@ 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 +from cadCAD.utils import key_filter +from cadCAD.configuration.utils.behaviorAggregation import dict_elemwise_sum class Configuration: @@ -122,7 +122,7 @@ class Processor: pass # Also for backwards compatibility, we accept partial state update blocks both as list or dict - # No need for a deprecation warning as it's already raised by SimCAD.utils.key_filter + # No need for a deprecation warning as it's already raised by cadCAD.utils.key_filter if (type(m)==list): for v in m: rename_keys(v) diff --git a/SimCAD/configuration/utils/__init__.py b/cadCAD/configuration/utils/__init__.py similarity index 100% rename from SimCAD/configuration/utils/__init__.py rename to cadCAD/configuration/utils/__init__.py diff --git a/SimCAD/configuration/utils/behaviorAggregation.py b/cadCAD/configuration/utils/behaviorAggregation.py similarity index 100% rename from SimCAD/configuration/utils/behaviorAggregation.py rename to cadCAD/configuration/utils/behaviorAggregation.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 c468490..68db2c3 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 98% rename from SimCAD/engine/simulation.py rename to cadCAD/engine/simulation.py index 0b75bf4..052ed63 100644 --- a/SimCAD/engine/simulation.py +++ b/cadCAD/engine/simulation.py @@ -1,6 +1,6 @@ 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) 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/cadCAD-0.2-py3-none-any.whl b/dist/cadCAD-0.2-py3-none-any.whl new file mode 100644 index 0000000..4351720 Binary files /dev/null and b/dist/cadCAD-0.2-py3-none-any.whl differ diff --git a/dist/cadCAD-0.2.tar.gz b/dist/cadCAD-0.2.tar.gz new file mode 100644 index 0000000..0fc0df1 Binary files /dev/null and b/dist/cadCAD-0.2.tar.gz differ diff --git a/setup.py b/setup.py index 619744d..927996c 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,9 +10,9 @@ 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', - version='0.1', - description="SimCAD: a differential games based simulation software package for research, validation, and \ +setup(name='cadCAD', + version='0.2', + 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',