Changeset 419 for branches/alta/mystic-0.2a1/scipy_cg.py

Timestamp:

08/25/10 13:40:01 (6 years ago)

Author:

mmckerns

Message:

reduce scipy function copies (and likely delay due to importing)

File:

• branches/alta/mystic-0.2a1/scipy_cg.py (modified) (2 diffs)

branches/alta/mystic-0.2a1/scipy_cg.py

@@ -58 +58 @@
 
 from _scipyoptimize import zoom, _cubicmin, _quadmin, _epsilon
-from _scipyoptimize import line_search, approx_fprime
+from _scipyoptimize import linesearch, line_search, approx_fprime
 
 ##########################################################################
@@ -225 +225 @@
             old_old_fval_backup = old_old_fval
 
-           # NOTE: Without scipy.optimize's linesearch, results may be noticeably worse.
-            try:  
-                import scipy.optimize
-                alpha_k, fc, gc, old_fval, old_old_fval, gfkp1 = \
-                scipy.optimize.linesearch.line_search(func,myfprime,xk,pk,gfk,\
-                                      old_fval,old_old_fval,c2=0.4)
-            except ImportError:
-                alpha_k = None
-            #XXX Signal handler 'exit' won't work if it gets stuck inside scipy linesearch
+            alpha_k, fc, gc, old_fval, old_old_fval, gfkp1 = \
+                             linesearch.line_search(func,myfprime,xk,pk,gfk,\
+                             old_fval,old_old_fval,c2=0.4)
+            #XXX Signal handler 'exit' won't work
+            # if it gets stuck inside scipy linesearch
             #alpha_k = None