small changes

1 files changed, 35 insertions, 4 deletions

diff --git a/src/make_plots.py b/src/make_plots.py
index 10fd657..d719337 100644
--- a/src/make_plots.py
+++ b/src/make_plots.py
@@ -34,7 +34,7 @@ def compute_graph(graph_name, n_cascades, lbda, passed_function, min_proba,
     """
     G = cascade_creation.InfluenceGraph(max_proba=max_proba,
                                         min_proba=min_proba,
-                                        sparse_edges=True)
+                                        sparse_edges=sparse_edges)
     G.import_from_file(graph_name)
     A = cascade_creation.generate_cascades(G, p_init=.05, n_cascades=n_cascades)
 
@@ -77,6 +77,37 @@ def plot_watts_strogatz_graph():
     plt.savefig("../paper/figures/"+"watts_strogatz.pdf")
 
 
+def plot_barabasi_albert_graph():
+    """
+    plot information in a pretty way
+    """
+    plt.clf()
+    fig = plt.figure(1)
+    labels = [50, 100, 500, 1000, 2000, 5000]
+    x = [np.log(50), np.log(100), np.log(500), 
+            np.log(1000), np.log(2000), np.log(5000)]
+    sparse_recov = [.35, .38, .58, .69, .79, .86]
+    max_likel = [.35, .38, .56, .68, .78, .85]
+    lasso = [.25, .3, .55, .67, .76, .83]
+    greedy = [.1, .13, .33, .47, .6, .75]
+
+    fig, ax = plt.subplots()
+
+    plt.axis((np.log(45), np.log(5500), 0, 1))
+    plt.xlabel("Number of Cascades")
+    plt.ylabel("F1 score")
+    plt.grid(color="lightgrey")
+    ax.plot(x, greedy, 'ko-', color="lightseagreen", label='Greedy')
+    ax.plot(x, lasso, 'ko-', color="orange", label="Lasso")
+    ax.plot(x, max_likel, 'ko-', color="cornflowerblue", label="MLE")
+    ax.plot(x, sparse_recov, 'ko-', color="k", label="Our Method")
+    plt.legend(loc="lower right")
+    ax.set_xticks(x)
+    ax.set_xticklabels(tuple(labels))
+    plt.savefig("../paper/figures/"+"barabasi_albert.pdf")
+
+
+
 def plot_ROC_curve(figure_name):
     """
     plot information in a pretty way
@@ -137,8 +168,8 @@ if __name__=="__main__":
             #convex_optimization.type_lasso)
     if 1:
         compute_graph("../datasets/kronecker_graph_256_cross.txt", 
-            n_cascades=1000, lbda=.001, min_proba=.2, max_proba=.7,
+            n_cascades=100, lbda=.01, min_proba=.2, max_proba=.7,
             passed_function=
-            convex_optimization.sparse_recovery, 
-            #convex_optimization.type_lasso,
+            #convex_optimization.sparse_recovery, 
+            convex_optimization.type_lasso,
             sparse_edges=False)
\ No newline at end of file