From 12e52fe9e9e1ac286c1b64342a54d7eccd6d9332 Mon Sep 17 00:00:00 2001 From: jeanpouget-abadie Date: Tue, 3 Feb 2015 10:04:12 -0500 Subject: fixed weird bug? --- src/convex_optimization.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/convex_optimization.py') diff --git a/src/convex_optimization.py b/src/convex_optimization.py index 163b6d5..0fda456 100644 --- a/src/convex_optimization.py +++ b/src/convex_optimization.py @@ -101,7 +101,7 @@ def diff_and_opt(M_val, w_val, f_x, f_xz): #cvxopt.solvers.options['feastol'] = 2e-5 #cvxopt.solvers.options['abstol'] = 2e-5 #cvxopt.solvers.options['maxiters'] = 100 - cvxopt.solvers.options['show_progress'] = True + cvxopt.solvers.options['show_progress'] = False try: theta = cvxopt.solvers.cp(F, G, h)['x'] except ArithmeticError: @@ -120,16 +120,15 @@ def test(): """ lbda = .001 G = cascade_creation.InfluenceGraph(max_proba=.9) - G.erdos_init(n=100, p = .3) + G.erdos_init(n=20, p = .3) A = cascade_creation.generate_cascades(G, .1, 1000) - M_val, w_val = cascade_creation.icc_matrixvector_for_node(A, 0) + M_val, w_val = cascade_creation.icc_matrixvector_for_node(A, 2) #Type lasso if 1: f_x, f_xz = type_lasso(lbda) p_vec, _ = diff_and_opt(M_val, w_val, f_x, f_xz) - print(p_vec) - print(G.mat) + print(G.mat[2]) #Sparse recovery if 0: -- cgit v1.2.3-70-g09d2