Stanford Network, bugs fixed

previous commit was wrong

1 files changed, 2 insertions, 28 deletions

diff --git a/jpa_test/cascade_creation.py b/jpa_test/cascade_creation.py
index f30b208..c42ae7a 100644
--- a/jpa_test/cascade_creation.py
+++ b/jpa_test/cascade_creation.py
@@ -31,7 +31,8 @@ class InfluenceGraph(nx.Graph):
             u = int(split1[0])
             v = int(split2[0])
             G.add_edge(u,v)
-        return G
+        self.add_nodes_from(G.nodes())
+        self.add_edges_from(G.edges())
         
     @property
     def mat(self):
@@ -55,9 +56,7 @@ def icc_cascade(G, p_init):
     p_init: proba that node in seed set
     """
     susceptible = np.ones(G.number_of_nodes(), dtype=bool)
-    print susceptible
     active = np.random.rand(G.number_of_nodes()) < p_init
-    print active
     susceptible = susceptible - active
     cascade = []
     while active.any() and susceptible.any():
@@ -69,31 +68,6 @@ def icc_cascade(G, p_init):
     return cascade
 
 
-def concat_cascades(cascades):
-    """
-    Concatenate list of cascades into matrix
-    """
-    return np.vstack(cascades)
-
-
-
-def createStanfordGraph(file):
-    """
-    Takes a file from the Stanford collection of networks
-    Need to remove comments on top of the file
-    Graph still needs to be weighted on the edges
-    """
-    f = open(file, 'r')
-    data = f.readlines()
-    G = nx.DiGraph()
-    for edge in data:
-        split1 = edge.split('\t')
-        split2 = split1[1].split('\n')
-        
-        u = int(split1[0])
-        v = int(split2[0])
-        G.add_edge(u,v)
-    return G
 
 def test():
     """