aboutsummaryrefslogtreecommitdiffstats
path: root/src/make_plots.py
diff options
context:
space:
mode:
authorjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-03 19:11:35 -0500
committerjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-03 19:11:35 -0500
commit48a2de8744a7b03e196baa4fbede104eeb396c92 (patch)
tree964dbd0b39bc738b2c35df114b7c44643e4cbeaa /src/make_plots.py
parent1f293b379aab18f07c958aaa62c96916a6ae61c5 (diff)
downloadcascades-48a2de8744a7b03e196baa4fbede104eeb396c92.tar.gz
changes
Diffstat (limited to 'src/make_plots.py')
-rw-r--r--src/make_plots.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/make_plots.py b/src/make_plots.py
index 5b9664c..7da3e1e 100644
--- a/src/make_plots.py
+++ b/src/make_plots.py
@@ -31,7 +31,7 @@ def watts_strogatz(n_cascades, lbda, passed_function):
"""
Test running time on different algorithms
"""
- G = cascade_creation.InfluenceGraph(max_proba=1, min_proba=.2)
+ G = cascade_creation.InfluenceGraph(max_proba=.7, min_proba=.2)
G.import_from_file("../datasets/watts_strogatz_500_80_point3.txt")
A = cascade_creation.generate_cascades(G, p_init=.05, n_cascades=n_cascades)
@@ -40,7 +40,7 @@ def watts_strogatz(n_cascades, lbda, passed_function):
else:
G_hat = algorithms.recovery_passed_function(G, A,
passed_function=passed_function,
- floor_cstt=.1, lbda=lbda, n_cascades=1000)
+ floor_cstt=.1, lbda=lbda, n_cascades=n_cascades)
algorithms.correctness_measure(G, G_hat, print_values=True)
@@ -58,5 +58,5 @@ def test():
if __name__=="__main__":
- watts_strogatz(n_cascades=2000, lbda=.001, passed_function=
- algorithms.greedy_prediction)
+ watts_strogatz(n_cascades=1000, lbda=.001, passed_function=
+ convex_optimization.sparse_recovery)