diff options
| author | jeanpouget-abadie <jean.pougetabadie@gmail.com> | 2015-02-03 20:34:05 -0500 |
|---|---|---|
| committer | jeanpouget-abadie <jean.pougetabadie@gmail.com> | 2015-02-03 20:34:05 -0500 |
| commit | af2ac731db5077a802e3ec2924f210cc9fdbe5c6 (patch) | |
| tree | 9d9f2bcef77ebb2522a7e058245dc4f863c8381e /src/convex_optimization.py | |
| parent | a9acec30743687fdaf1df291b51b346bca7cf5a7 (diff) | |
| download | cascades-af2ac731db5077a802e3ec2924f210cc9fdbe5c6.tar.gz | |
more changes
Diffstat (limited to 'src/convex_optimization.py')
| -rw-r--r-- | src/convex_optimization.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/convex_optimization.py b/src/convex_optimization.py index 5942c70..913fcb4 100644 --- a/src/convex_optimization.py +++ b/src/convex_optimization.py @@ -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(-.1, (n,1)) elif z is None: y, y_diff = f_x(x, M_val, w_val) return cvxopt.matrix(float(y), (1, 1)),\ @@ -105,10 +105,10 @@ def diff_and_opt(M_val, w_val, f_x, f_xz): h = cvxopt.matrix(0.0, (n,1)) #Relaxing precision constraints - cvxopt.solvers.options['feastol'] = 2e-5 - cvxopt.solvers.options['abstol'] = 2e-5 + # cvxopt.solvers.options['feastol'] = 2e-5 + # cvxopt.solvers.options['abstol'] = 2e-5 # cvxopt.solvers.options['maxiters'] = 50 - cvxopt.solvers.options['show_progress'] = True + cvxopt.solvers.options['show_progress'] = False try: theta = cvxopt.solvers.cp(F, G, h)['x'] except ArithmeticError: |