aboutsummaryrefslogtreecommitdiffstats
path: root/src/cascade_creation.py
diff options
context:
space:
mode:
authorjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-03 16:06:07 -0500
committerjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-03 16:06:07 -0500
commit8f65bdb15bf7a76ba0a07836644731d098c15d03 (patch)
tree1361b4a038d966432a282adcd5c89fcb365b8011 /src/cascade_creation.py
parenta9125f9e7c23063e42eeaceead8c8014686c6427 (diff)
downloadcascades-8f65bdb15bf7a76ba0a07836644731d098c15d03.tar.gz
changes for runnning functions
Diffstat (limited to 'src/cascade_creation.py')
-rw-r--r--src/cascade_creation.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cascade_creation.py b/src/cascade_creation.py
index c297f76..df0384e 100644
--- a/src/cascade_creation.py
+++ b/src/cascade_creation.py
@@ -25,8 +25,8 @@ class InfluenceGraph(nx.DiGraph):
p : proba of rewiring edge
"""
G = nx.connected_watts_strogatz_graph(n, k, p)
- G = nx.convert_to_directed(G)
self.add_edges_from(G.edges())
+ self.add_edges_from([(node_2, node_1) for node_1, node_2 in G.edges()])
def import_from_file(self, file_name):
"""
@@ -153,7 +153,6 @@ 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)
#TODO: update G's mat matrix