Merge branch 'master' of https://github.com/BlockScience/Aragon_Conviction_Voting

models/v1/model/economyconfig.py

@@ -4,7 +4,7 @@ from datetime import timedelta
 import numpy as np
 from typing import Dict, List
 
-from cadCAD.configuration import append_configs
+from cadCAD.configuration import Experiment
 from cadCAD.configuration.utils import bound_norm_random, ep_time_step, config_sim, access_block
 
 from .genesis_states import genesis_states
@@ -21,7 +21,9 @@ seeds = {
 }
 
 
-append_configs(
+exp = Experiment()
+
+exp.append_configs(
     sim_configs=sim_config,
     initial_state=genesis_states,
     seeds=seeds,
@@ -30,6 +32,7 @@ append_configs(
 
 
 
+
 def get_configs():
     '''
     Function to extract the configuration information for display in a notebook.

models/v2 workshop-copy/model/economyconfig.py

@@ -4,7 +4,7 @@ from datetime import timedelta
 import numpy as np
 from typing import Dict, List
 
-from cadCAD.configuration import append_configs
+from cadCAD.configuration import Experiment
 from cadCAD.configuration.utils import bound_norm_random, ep_time_step, config_sim, access_block
 
 from .genesis_states import genesis_states
@@ -21,7 +21,9 @@ seeds = {
 }
 
 
-append_configs(
+exp = Experiment()
+
+exp.append_configs(
     sim_configs=sim_config,
     initial_state=genesis_states,
     seeds=seeds,
@@ -30,6 +32,7 @@ append_configs(
 
 
 
+
 def get_configs():
     '''
     Function to extract the configuration information for display in a notebook.

models/v2/model/economyconfig.py

@@ -4,7 +4,7 @@ from datetime import timedelta
 import numpy as np
 from typing import Dict, List
 
-from cadCAD.configuration import append_configs
+from cadCAD.configuration import Experiment
 from cadCAD.configuration.utils import bound_norm_random, ep_time_step, config_sim, access_block
 
 from .genesis_states import genesis_states
@@ -13,7 +13,7 @@ from .partial_state_update_block import partial_state_update_blocks
 
 sim_config = config_sim({
     'N': 1,
-    'T': range(60), #day 
+    'T': range(100), #day 
 })
 
 seeds = {
@@ -21,7 +21,9 @@ seeds = {
 }
 
 
-append_configs(
+exp = Experiment()
+
+exp.append_configs(
     sim_configs=sim_config,
     initial_state=genesis_states,
     seeds=seeds,
@@ -30,6 +32,7 @@ append_configs(
 
 
 
+
 def get_configs():
     '''
     Function to extract the configuration information for display in a notebook.