aboutsummaryrefslogtreecommitdiffstats
path: root/src/cascade_creation.py
diff options
context:
space:
mode:
authorjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-03 10:04:12 -0500
committerjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-03 10:04:12 -0500
commit12e52fe9e9e1ac286c1b64342a54d7eccd6d9332 (patch)
tree526c3f12b747f328772a2e3fbf0941fd0da21aaa /src/cascade_creation.py
parentf95792d89fff45e9a3630486805a7c516778db84 (diff)
downloadcascades-12e52fe9e9e1ac286c1b64342a54d7eccd6d9332.tar.gz
fixed weird bug?
Diffstat (limited to 'src/cascade_creation.py')
-rw-r--r--src/cascade_creation.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cascade_creation.py b/src/cascade_creation.py
index 39fc531..db0ea7a 100644
--- a/src/cascade_creation.py
+++ b/src/cascade_creation.py
@@ -9,8 +9,9 @@ class InfluenceGraph(nx.DiGraph):
"""
networkX graph with mat and logmat attributes
"""
- def __init__(self, max_proba, *args, **kwargs):
+ def __init__(self, max_proba=None, min_proba=None, *args, **kwargs):
self.max_proba = max_proba
+ self.min_proba = min_proba
super(InfluenceGraph, self).__init__(*args, **kwargs)
def erdos_init(self, n, p):
@@ -142,8 +143,10 @@ def add_edges_from_proba_vector(G, p_node, node, floor_cstt):
Also updates G's mat matrix
"""
floor_parent = np.nonzero(p_node*(p_node > floor_cstt))
+ print(floor_parent)
for parent in floor_parent[0]:
- G.add_edge(parent, node)
+ #SOMEHOW THERE WAS A BUG HERE!
+ G.add_edge(node, parent)
#TODO: update G's mat matrix
return G