diff options
| author | jeanpouget-abadie <jean.pougetabadie@gmail.com> | 2015-02-03 16:06:07 -0500 |
|---|---|---|
| committer | jeanpouget-abadie <jean.pougetabadie@gmail.com> | 2015-02-03 16:06:07 -0500 |
| commit | 8f65bdb15bf7a76ba0a07836644731d098c15d03 (patch) | |
| tree | 1361b4a038d966432a282adcd5c89fcb365b8011 /src/convex_optimization.py | |
| parent | a9125f9e7c23063e42eeaceead8c8014686c6427 (diff) | |
| download | cascades-8f65bdb15bf7a76ba0a07836644731d098c15d03.tar.gz | |
changes for runnning functions
Diffstat (limited to 'src/convex_optimization.py')
| -rw-r--r-- | src/convex_optimization.py | 6 |
1 files changed, 3 insertions, 3 deletions
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: |