From 8f65bdb15bf7a76ba0a07836644731d098c15d03 Mon Sep 17 00:00:00 2001 From: jeanpouget-abadie Date: Tue, 3 Feb 2015 16:06:07 -0500 Subject: changes for runnning functions --- src/convex_optimization.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/convex_optimization.py') diff --git a/src/convex_optimization.py b/src/convex_optimization.py index f283d6b..f4c997a 100644 --- a/src/convex_optimization.py +++ b/src/convex_optimization.py @@ -80,7 +80,7 @@ def type_lasso(lbda): return f_x, f_xz -@timeout.timeout(8) +@timeout.timeout(30) def diff_and_opt(M_val, w_val, f_x, f_xz): if M_val.dtype == bool: @@ -90,7 +90,7 @@ def diff_and_opt(M_val, w_val, f_x, f_xz): def F(x=None, z=None): if x is None: - return 0, cvxopt.matrix(-.001, (n,1)) + return 0, cvxopt.matrix(-.0001, (n,1)) elif z is None: y, y_diff = f_x(x, M_val, w_val) return cvxopt.matrix(float(y), (1, 1)),\ @@ -108,7 +108,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'] = False + cvxopt.solvers.options['show_progress'] = True try: theta = cvxopt.solvers.cp(F, G, h)['x'] except ArithmeticError: -- cgit v1.2.3-70-g09d2