quick debugg on convictio3

BlockScience · Oct 19, 2019 · 54763ac · 54763ac
1 parent 800c102
commit 54763ac
Show file tree

Hide file tree

Showing 6 changed files with 363 additions and 333 deletions.
diff --git a/__pycache__/bonding_curve_eq.cpython-36.pyc b/__pycache__/bonding_curve_eq.cpython-36.pyc
diff --git a/__pycache__/conviction_helpers.cpython-36.pyc b/__pycache__/conviction_helpers.cpython-36.pyc
diff --git a/__pycache__/conviction_system_logic3.cpython-36.pyc b/__pycache__/conviction_system_logic3.cpython-36.pyc
diff --git a/conviction_cadCAD3.ipynb b/conviction_cadCAD3.ipynb
diff --git a/conviction_helpers.py b/conviction_helpers.py
@@ -87,7 +87,7 @@ def initialize_network(n,m, funds_func=total_funds_given_total_supply, trigger_f
         network.nodes[j]['age']=0
 
         r_rv = gamma.rvs(3,loc=0.001, scale=10000)
-        network.node[j]['funds_requested'] = r_rv
+        network.nodes[j]['funds_requested'] = r_rv
 
         network.nodes[j]['trigger']= trigger_threshold(r_rv, initial_funds, initial_supply)
 

diff --git a/conviction_system_logic3.py b/conviction_system_logic3.py
@@ -49,7 +49,7 @@ def gen_new_proposal(network, funds, supply, trigger_func, scale_factor = 1.0/10
 
     rescale = funds*scale_factor
     r_rv = gamma.rvs(3,loc=0.001, scale=rescale)
-    network.node[j]['funds_requested'] = r_rv
+    network.nodes[j]['funds_requested'] = r_rv
 
     network.nodes[j]['trigger']= trigger_func(r_rv, funds, supply)
 
@@ -252,8 +252,8 @@ def complete_proposal(params, step, sL, s, _input):
 
         for i in participants:
             force = network.edges[(i,j)]['affinity']
-            sentiment = network.node[i]['sentiment']
-            network.node[i]['sentiment'] = get_sentimental(sentiment, force, decay=0)
+            sentiment = network.nodes[i]['sentiment']
+            network.nodes[i]['sentiment'] = get_sentimental(sentiment, force, decay=0)
 
 
 
@@ -262,8 +262,8 @@ def complete_proposal(params, step, sL, s, _input):
         network.nodes[j]['status']='failed' 
         for i in participants:
             force = -network.edges[(i,j)]['affinity']
-            sentiment = network.node[i]['sentiment']
-            network.node[i]['sentiment'] = get_sentimental(sentiment, force, decay=0)
+            sentiment = network.nodes[i]['sentiment']
+            network.nodes[i]['sentiment'] = get_sentimental(sentiment, force, decay=0)
 
     key = 'network'
     value = network