aboutsummaryrefslogtreecommitdiffstats
path: root/src/make_plots.py
diff options
context:
space:
mode:
authorjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-02 22:45:07 -0500
committerjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-02 22:45:07 -0500
commitda8c267a9d10deb593e98d06c26ad09afd2af3b1 (patch)
treefe09aa8099841c209597c913b20a97eed136e3c0 /src/make_plots.py
parent683dbbdff11b7aa3b99641c82c3413c9c1bd1d9b (diff)
downloadcascades-da8c267a9d10deb593e98d06c26ad09afd2af3b1.tar.gz
model section
Diffstat (limited to 'src/make_plots.py')
-rw-r--r--src/make_plots.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/make_plots.py b/src/make_plots.py
index 3ac8362..c1cafe7 100644
--- a/src/make_plots.py
+++ b/src/make_plots.py
@@ -23,7 +23,7 @@ def compare_greedy_and_lagrange_cs284r():
#Lagrange Objective
G_hat = algorithms.recovery_l1obj_l2constraint(G, A,
passed_function=convex_optimization.type_lasso,
- floor_cstt=.1, lbda=10)
+ floor_cstt=.05, lbda=10)
algorithms.correctness_measure(G, G_hat, print_values=True)
@@ -32,11 +32,11 @@ def test():
unit test
"""
G = cascade_creation.InfluenceGraph(max_proba=.8)
- G.erdos_init(n=20, p=.2)
+ G.erdos_init(n=30, p=.2)
A = cascade_creation.generate_cascades(G, p_init=.1, n_cascades=1000)
- G_hat = algorithms.recovery_l1obj_l2constraint(G, A,
- passed_function=convex_optimization.sparse_recovery,
- floor_cstt=.1, lbda=1)
+ G_hat = algorithms.recovery_passed_function(G, A,
+ passed_function=convex_optimization.type_lasso,
+ floor_cstt=.001, lbda=.0001)
algorithms.correctness_measure(G, G_hat, print_values=True)
if __name__=="__main__":