Merge pull request #61 from BlockScience/staging

Update Description

.gitignore

@@ -3,6 +3,7 @@ jupyter notebook
 .ipynb_checkpoints
 .DS_Store
 .idea
+.pytest_cache/
 notebooks
 *.egg-info
 __pycache__

AUTHORS.txt

@@ -16,14 +16,14 @@ Contributors:
 - Matthew V. Barlin
 - Michael Zargham
 - Zixuan Zhang
+- Charles Rice
 
 
 We’d also like to thank:
 - Andrew Clark
 - Nikhil Jamdade
 - Nick Hirannet
+- Jonathan Gabler
+- Chris Frazier
 - Harry Goodnight
 - Charlie Hoppes
-- Jonathan Gabler
-- Charles Rice
-

README.md

@@ -32,7 +32,7 @@ under various conditions. Support for A/B testing policies, Monte Carlo analysis
 provided.
 
 
-In essence, cadCAD tool allows us to represent a company’s or community’s current business model along with a desired 
+For example, cadCAD tool allows us to represent a company’s or community’s current business model along with a desired 
 future state and helps make informed, rigorously tested decisions on how to get from today’s stage to the future state. 
 It allows us to use code to solidify our conceptualized ideas and see if the outcome meets our expectations. We can 
 iteratively refine our work until we have constructed a model that closely reflects reality at the start of the model, 

ascii_art.txt

@@ -0,0 +1,15 @@
+Complex Adaptive Dynamics
+o       i        e
+m       d        s
+p       e        i
+u       d        g
+t                n
+e
+r
+
+                    __________   ____
+  ________ __ _____/ ____/   |  / __ \
+ / ___/ __` / __  / /   / /| | / / / /
+/ /__/ /_/ / /_/ / /___/ ___ |/ /_/ /
+\___/\__,_/\__,_/\____/_/  |_/_____/
+by BlockScience

cadCAD/configuration/__init__.py

@@ -47,6 +47,8 @@ def append_configs(sim_configs={}, initial_state={}, seeds={}, raw_exogenous_sta
             partial_state_update_blocks=partial_state_update_blocks,
             policy_ops=policy_ops
         )
+        print(sim_configs)
+        #for each sim config create new config
         configs.append(config)
 
 

setup.py

@@ -1,14 +1,22 @@
 from setuptools import setup, find_packages
 
-long_description = "cadCAD is a differential games based simulation software package for research, validation, and \
+long_description = """
-    Computer Aided Design of economic systems. An economic system is treated as a state based model and defined through \
+cadCAD (complex adaptive systems computer-aided design) is a python based, unified modeling framework for stochastic 
-    a set of endogenous and exogenous state variables which are updated through mechanisms and environmental processes, \
+dynamical systems and differential games for research, validation, and Computer Aided Design of economic systems created 
-    respectively. Behavioral models, which may be deterministic or stochastic, provide the evolution of the system \
+by BlockScience. It is capable of modeling systems at all levels of abstraction from Agent Based Modeling (ABM) to 
-    within the action space of the mechanisms. Mathematical formulations of these economic games treat agent utility as \
+System Dynamics (SD), and enabling smooth integration of computational social science simulations with empirical data 
-    derived from state rather than direct from action, creating a rich dynamic modeling framework. Simulations may be \
+science workflows.
-    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 A/B testing policies, \
+
-    monte carlo analysis and other common numerical methods is provided."
+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 within the action space of the mechanisms. 
+Mathematical formulations of these economic games treat agent utility as derived from the state rather than direct from 
+an 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 A/B testing policies, Monte Carlo analysis, and other common numerical methods is 
+provided.
+"""
 
 setup(name='cadCAD',
       version='0.3.0',