aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/convex_optimization.py4
-rw-r--r--src/make_plots.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/convex_optimization.py b/src/convex_optimization.py
index 530e3f5..96dc26f 100644
--- a/src/convex_optimization.py
+++ b/src/convex_optimization.py
@@ -6,7 +6,7 @@ import timeout
import cvxopt
-@timeout.timeout(10)
+@timeout.timeout(20)
def l1obj_l2constraint(M_val, w_val):
"""
Solves:
@@ -61,7 +61,7 @@ def l1obj_l2constraint(M_val, w_val):
return 1 - np.exp(theta), theta
-@timeout.timeout(10)
+@timeout.timeout(20)
def l1obj_l2penalization(M_val, w_val, lbda):
"""
Solves:
diff --git a/src/make_plots.py b/src/make_plots.py
index 905c731..5a61c10 100644
--- a/src/make_plots.py
+++ b/src/make_plots.py
@@ -40,7 +40,7 @@ def compare_greedy_and_lagrange_cs284r():
"""
G = cascade_creation.InfluenceGraph(max_proba = .8)
G.import_from_file("../datasets/subset_facebook_SNAPnormalize.txt")
- A = cascade_creation.generate_cascades(G, p_init=.05, n_cascades=100)
+ A = cascade_creation.generate_cascades(G, p_init=.05, n_cascades=1000)
#Greedy
G_hat = algorithms.greedy_prediction(G, A)