From 8f65bdb15bf7a76ba0a07836644731d098c15d03 Mon Sep 17 00:00:00 2001 From: jeanpouget-abadie Date: Tue, 3 Feb 2015 16:06:07 -0500 Subject: changes for runnning functions --- src/cascade_creation.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/cascade_creation.py') 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 -- cgit v1.2.3-70-g09d2