second model

2020-07-28 10:09:47 -04:00 · 2020-07-28 10:09:47 -04:00 · 859d526640
parent 80f1f3f2a0
commit 859d526640
185 changed files with 4802 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -5,8 +5,8 @@

 ## Simulations

-[Initial model](Aragon_Conviction_Voting_Model.ipynb)
-
+[Initial model](v1/Aragon_Conviction_Voting_Model.ipynb)
+[Full complexity modell](v2/Aragon_Conviction_Voting_Model.ipynb)
 ## Background information & concepts addressed

 ### What is cadCAD?
--- a/v1/Aragon_Conviction_Voting_Model.ipynb
+++ b/v1/Aragon_Conviction_Voting_Model.ipynb
--- a/v1/images/Aragon_v1.png
+++ b/v1/images/Aragon_v1.png
--- a/v1/images/bipartite-cv-compute.png
+++ b/v1/images/bipartite-cv-compute.png
--- a/v1/images/stockflow-cv-trigger.png
+++ b/v1/images/stockflow-cv-trigger.png
--- a/v1/model/pycache/economyconfig.cpython-36.pyc
+++ b/v1/model/pycache/economyconfig.cpython-36.pyc
--- a/v1/model/pycache/economyconfig.cpython-37.pyc
+++ b/v1/model/pycache/economyconfig.cpython-37.pyc
--- a/v1/model/pycache/genesis_states.cpython-36.pyc
+++ b/v1/model/pycache/genesis_states.cpython-36.pyc
--- a/v1/model/pycache/genesis_states.cpython-37.pyc
+++ b/v1/model/pycache/genesis_states.cpython-37.pyc
--- a/v1/model/pycache/partial_state_update_block.cpython-36.pyc
+++ b/v1/model/pycache/partial_state_update_block.cpython-36.pyc
--- a/v1/model/pycache/partial_state_update_block.cpython-37.pyc
+++ b/v1/model/pycache/partial_state_update_block.cpython-37.pyc
--- a/v1/model/pycache/run.cpython-36.pyc
+++ b/v1/model/pycache/run.cpython-36.pyc
--- a/v1/model/pycache/run.cpython-37.pyc
+++ b/v1/model/pycache/run.cpython-37.pyc
--- a/v1/model/economyconfig.py
+++ b/v1/model/economyconfig.py
--- a/v1/model/genesis_states.py
+++ b/v1/model/genesis_states.py
--- a/v1/model/model/pycache/conviction_helper_functions.cpython-36.pyc
+++ b/v1/model/model/pycache/conviction_helper_functions.cpython-36.pyc
--- a/v1/model/model/pycache/conviction_helper_functions.cpython-37.pyc
+++ b/v1/model/model/pycache/conviction_helper_functions.cpython-37.pyc
--- a/v1/model/model/pycache/designed.cpython-36.pyc
+++ b/v1/model/model/pycache/designed.cpython-36.pyc
--- a/v1/model/model/pycache/designed.cpython-37.pyc
+++ b/v1/model/model/pycache/designed.cpython-37.pyc
--- a/v1/model/model/pycache/exogenousProcesses.cpython-36.pyc
+++ b/v1/model/model/pycache/exogenousProcesses.cpython-36.pyc
--- a/v1/model/model/pycache/exogenousProcesses.cpython-37.pyc
+++ b/v1/model/model/pycache/exogenousProcesses.cpython-37.pyc
--- a/v1/model/model/pycache/initialization.cpython-36.pyc
+++ b/v1/model/model/pycache/initialization.cpython-36.pyc
--- a/v1/model/model/pycache/initialization.cpython-37.pyc
+++ b/v1/model/model/pycache/initialization.cpython-37.pyc
--- a/v1/model/model/pycache/kpis.cpython-36.pyc
+++ b/v1/model/model/pycache/kpis.cpython-36.pyc
--- a/v1/model/model/pycache/kpis.cpython-37.pyc
+++ b/v1/model/model/pycache/kpis.cpython-37.pyc
--- a/v1/model/model/pycache/operatorentity.cpython-37.pyc
+++ b/v1/model/model/pycache/operatorentity.cpython-37.pyc
--- a/v1/model/model/pycache/participants.cpython-36.pyc
+++ b/v1/model/model/pycache/participants.cpython-36.pyc
--- a/v1/model/model/pycache/participants.cpython-37.pyc
+++ b/v1/model/model/pycache/participants.cpython-37.pyc
--- a/v1/model/model/pycache/proposals.cpython-36.pyc
+++ b/v1/model/model/pycache/proposals.cpython-36.pyc
--- a/v1/model/model/pycache/proposals.cpython-37.pyc
+++ b/v1/model/model/pycache/proposals.cpython-37.pyc
--- a/v1/model/model/pycache/subpopulation_clusters.cpython-37.pyc
+++ b/v1/model/model/pycache/subpopulation_clusters.cpython-37.pyc
--- a/v1/model/model/pycache/supportingFunctions.cpython-37.pyc
+++ b/v1/model/model/pycache/supportingFunctions.cpython-37.pyc
--- a/v1/model/model/pycache/system.cpython-36.pyc
+++ b/v1/model/model/pycache/system.cpython-36.pyc
--- a/v1/model/model/pycache/system.cpython-37.pyc
+++ b/v1/model/model/pycache/system.cpython-37.pyc
--- a/v1/model/model/conviction_helper_functions.py
+++ b/v1/model/model/conviction_helper_functions.py
--- a/v1/model/model/initialization.py
+++ b/v1/model/model/initialization.py
--- a/v1/model/model/participants.py
+++ b/v1/model/model/participants.py
--- a/v1/model/model/proposals.py
+++ b/v1/model/model/proposals.py
--- a/v1/model/model/system.py
+++ b/v1/model/model/system.py
--- a/v1/model/partial_state_update_block.py
+++ b/v1/model/partial_state_update_block.py
--- a/v1/model/run.py
+++ b/v1/model/run.py
--- a/v2/.ipynb_checkpoints/Aragon
+++ b/v2/.ipynb_checkpoints/Aragon
--- a/v2/.ipynb_checkpoints/Aragon_Conviction_Voting_Model-checkpoint.ipynb
+++ b/v2/.ipynb_checkpoints/Aragon_Conviction_Voting_Model-checkpoint.ipynb
--- a/v2/Aragon_Conviction_Voting_Model.ipynb
+++ b/v2/Aragon_Conviction_Voting_Model.ipynb
--- a/v2/images/Aragon_v2.png
+++ b/v2/images/Aragon_v2.png
--- a/v2/images/bipartite_cv_compute.png
+++ b/v2/images/bipartite_cv_compute.png
--- a/v2/images/cv_bipartite.png
+++ b/v2/images/cv_bipartite.png
--- a/v2/images/snap/0.png
+++ b/v2/images/snap/0.png
--- a/v2/images/snap/1.png
+++ b/v2/images/snap/1.png
--- a/v2/images/snap/10.png
+++ b/v2/images/snap/10.png
--- a/v2/images/snap/11.png
+++ b/v2/images/snap/11.png
--- a/v2/images/snap/12.png
+++ b/v2/images/snap/12.png
--- a/v2/images/snap/13.png
+++ b/v2/images/snap/13.png
--- a/v2/images/snap/14.png
+++ b/v2/images/snap/14.png
--- a/v2/images/snap/15.png
+++ b/v2/images/snap/15.png
--- a/v2/images/snap/16.png
+++ b/v2/images/snap/16.png
--- a/v2/images/snap/17.png
+++ b/v2/images/snap/17.png
--- a/v2/images/snap/18.png
+++ b/v2/images/snap/18.png
--- a/v2/images/snap/19.png
+++ b/v2/images/snap/19.png
--- a/v2/images/snap/2.png
+++ b/v2/images/snap/2.png
--- a/v2/images/snap/20.png
+++ b/v2/images/snap/20.png
--- a/v2/images/snap/21.png
+++ b/v2/images/snap/21.png
--- a/v2/images/snap/22.png
+++ b/v2/images/snap/22.png
--- a/v2/images/snap/23.png
+++ b/v2/images/snap/23.png
--- a/v2/images/snap/24.png
+++ b/v2/images/snap/24.png
--- a/v2/images/snap/25.png
+++ b/v2/images/snap/25.png
--- a/v2/images/snap/26.png
+++ b/v2/images/snap/26.png
--- a/v2/images/snap/27.png
+++ b/v2/images/snap/27.png
--- a/v2/images/snap/28.png
+++ b/v2/images/snap/28.png
--- a/v2/images/snap/29.png
+++ b/v2/images/snap/29.png
--- a/v2/images/snap/3.png
+++ b/v2/images/snap/3.png
--- a/v2/images/snap/30.png
+++ b/v2/images/snap/30.png
--- a/v2/images/snap/31.png
+++ b/v2/images/snap/31.png
--- a/v2/images/snap/32.png
+++ b/v2/images/snap/32.png
--- a/v2/images/snap/33.png
+++ b/v2/images/snap/33.png
--- a/v2/images/snap/34.png
+++ b/v2/images/snap/34.png
--- a/v2/images/snap/35.png
+++ b/v2/images/snap/35.png
--- a/v2/images/snap/36.png
+++ b/v2/images/snap/36.png
--- a/v2/images/snap/37.png
+++ b/v2/images/snap/37.png
--- a/v2/images/snap/38.png
+++ b/v2/images/snap/38.png
--- a/v2/images/snap/39.png
+++ b/v2/images/snap/39.png
--- a/v2/images/snap/4.png
+++ b/v2/images/snap/4.png
--- a/v2/images/snap/40.png
+++ b/v2/images/snap/40.png
--- a/v2/images/snap/41.png
+++ b/v2/images/snap/41.png
--- a/v2/images/snap/42.png
+++ b/v2/images/snap/42.png
--- a/v2/images/snap/43.png
+++ b/v2/images/snap/43.png
--- a/v2/images/snap/44.png
+++ b/v2/images/snap/44.png
--- a/v2/images/snap/45.png
+++ b/v2/images/snap/45.png
--- a/v2/images/snap/46.png
+++ b/v2/images/snap/46.png
--- a/v2/images/snap/47.png
+++ b/v2/images/snap/47.png
--- a/v2/images/snap/48.png
+++ b/v2/images/snap/48.png
--- a/v2/images/snap/49.png
+++ b/v2/images/snap/49.png
--- a/v2/images/snap/5.png
+++ b/v2/images/snap/5.png
--- a/v2/images/snap/50.png
+++ b/v2/images/snap/50.png
--- a/v2/images/snap/51.png
+++ b/v2/images/snap/51.png
--- a/v2/images/snap/52.png
+++ b/v2/images/snap/52.png
--- a/v2/images/snap/53.png
+++ b/v2/images/snap/53.png
--- a/v2/images/snap/54.png
+++ b/v2/images/snap/54.png
--- a/v2/images/snap/55.png
+++ b/v2/images/snap/55.png
--- a/v2/images/snap/56.png
+++ b/v2/images/snap/56.png
--- a/Show More
+++ b/Show More