Merge pull request cadCAD-org#52 from joraojr/master

Fix tutorials and demo code
heyhewi · Jun 2, 2022 · b99c82d · b99c82d
2 parents 6382676 + f6740ff
commit b99c82d
Show file tree

Hide file tree

Showing 30 changed files with 2,493 additions and 4,255 deletions.
diff --git a/demos/Agent_Based_Modeling/prey_predator_abm/Predator_Prey_ABM_model.ipynb b/demos/Agent_Based_Modeling/prey_predator_abm/Predator_Prey_ABM_model.ipynb
diff --git a/demos/Agent_Based_Modeling/prey_predator_abm/model/run.py b/demos/Agent_Based_Modeling/prey_predator_abm/model/run.py
@@ -1,8 +1,7 @@
 import pandas as pd
 from .parts.utils import * 
-from model import config 
 from cadCAD.engine import ExecutionMode, ExecutionContext,Executor
-from cadCAD import configs
+from .config import exp
 
 def run():
     '''
@@ -13,7 +12,7 @@ def run():
     exec_mode = ExecutionMode()
     local_mode_ctx = ExecutionContext(context=exec_mode.local_mode)
 
-    simulation = Executor(exec_context=local_mode_ctx, configs=configs)
+    simulation = Executor(exec_context=local_mode_ctx, configs=exp.configs)
     raw_system_events, tensor_field, sessions = simulation.execute()
     # Result System Events DataFrame
     df = pd.DataFrame(raw_system_events)

diff --git a/demos/Multiscale/ThreeSided/ThreeSidedMarket.ipynb b/demos/Multiscale/ThreeSided/ThreeSidedMarket.ipynb
diff --git a/demos/Multiscale/ThreeSided/model/run.py b/demos/Multiscale/ThreeSided/model/run.py
@@ -1,8 +1,7 @@
 import pandas as pd
 from .parts.utils import * 
-from model import config 
 from cadCAD.engine import ExecutionMode, ExecutionContext,Executor
-from cadCAD import configs
+from .config import exp
 
 def run():
     '''
@@ -12,7 +11,7 @@ def run():
     exec_mode = ExecutionMode()
     local_mode_ctx = ExecutionContext(context=exec_mode.local_mode)
 
-    simulation = Executor(exec_context=local_mode_ctx, configs=configs)
+    simulation = Executor(exec_context=local_mode_ctx, configs=exp.configs)
     raw_system_events, tensor_field, sessions = simulation.execute()
     # Result System Events DataFrame
     df = pd.DataFrame(raw_system_events)

diff --git a/demos/Multiscale/ThreeSidedBasic/BasicThreeSidedMarketModel.ipynb b/demos/Multiscale/ThreeSidedBasic/BasicThreeSidedMarketModel.ipynb
diff --git a/demos/Multiscale/ThreeSidedBasic/model/run.py b/demos/Multiscale/ThreeSidedBasic/model/run.py
@@ -1,9 +1,6 @@
-import pandas as pd
-from .parts.utils import * 
-from model import config 
+from .parts.utils import *
 from cadCAD.engine import ExecutionMode, ExecutionContext,Executor
-from cadCAD import configs
-
+from .config import exp
 def run():
     '''
     Definition:
@@ -12,7 +9,7 @@ def run():
     exec_mode = ExecutionMode()
     local_mode_ctx = ExecutionContext(context=exec_mode.local_mode)
 
-    simulation = Executor(exec_context=local_mode_ctx, configs=configs)
+    simulation = Executor(exec_context=local_mode_ctx, configs=exp.configs)
     raw_system_events, tensor_field, sessions = simulation.execute()
     # Result System Events DataFrame
     df = pd.DataFrame(raw_system_events)

diff --git a/demos/Multiscale/adoption_funnel/adoption_funnel_model.ipynb b/demos/Multiscale/adoption_funnel/adoption_funnel_model.ipynb
diff --git a/demos/Multiscale/adoption_funnel/model/config.py b/demos/Multiscale/adoption_funnel/model/config.py
@@ -35,7 +35,7 @@
 # # # # # # # # # # # # # # # # # # # # GENESIS SWEEP LOGIC # # # # # # # # # # # # # # # # # # # #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 
-for c in configs: # for each configuration object
+for c in exp.configs: # for each configuration object
     c.initial_state = deepcopy(c.initial_state) # make a deepcopy of the initial state dict (it's shared across configs by default)
 
     c.initial_state['pool'] = Adoption_Pool(c.sim_config['M']['SOURCE_POOL'])
diff --git a/demos/Multiscale/adoption_funnel/model/run.py b/demos/Multiscale/adoption_funnel/model/run.py
@@ -1,8 +1,6 @@
 import pandas as pd
-from .parts.utils import * 
-from model import config 
 from cadCAD.engine import ExecutionMode, ExecutionContext,Executor
-from cadCAD import configs
+from .config import exp
 
 
 def get_M(k, v):
@@ -13,7 +11,7 @@ def get_M(k, v):
 config_ids = [
     dict(
         get_M(k, v) for k, v in config.__dict__.items() if k in ['simulation_id', 'run_id', 'sim_config', 'subset_id']
-    ) for config in configs
+    ) for config in exp.configs
 ]
 
 
@@ -25,15 +23,15 @@ def run(drop_midsteps=True):
     exec_mode = ExecutionMode()
     local_mode_ctx = ExecutionContext(context=exec_mode.local_mode)
 
-    simulation = Executor(exec_context=local_mode_ctx, configs=configs)
+    simulation = Executor(exec_context=local_mode_ctx, configs=exp.configs)
     raw_system_events, tensor_field, sessions = simulation.execute()
     # Result System Events DataFrame
     df = pd.DataFrame(raw_system_events)
 
     config_ids = [
     dict(
         get_M(k, v) for k, v in config.__dict__.items() if k in ['simulation_id', 'run_id', 'sim_config', 'subset_id']
-    ) for config in configs
+    ) for config in exp.configs
 ]
 
     results = pd.DataFrame()

diff --git a/demos/Multiscale/amm_mechanism/model/run.py b/demos/Multiscale/amm_mechanism/model/run.py
@@ -1,8 +1,6 @@
 import pandas as pd
-from .parts.utils import * 
-from model import config 
 from cadCAD.engine import ExecutionMode, ExecutionContext,Executor
-from cadCAD import configs
+from .config import exp
 
 def run():
     '''
@@ -13,7 +11,7 @@ def run():
     exec_mode = ExecutionMode()
     local_mode_ctx = ExecutionContext(context=exec_mode.local_mode)
 
-    simulation = Executor(exec_context=local_mode_ctx, configs=configs)
+    simulation = Executor(exec_context=local_mode_ctx, configs=exp.configs)
     raw_system_events, tensor_field, sessions = simulation.execute()
     # Result System Events DataFrame
     df = pd.DataFrame(raw_system_events)