Changeset 419 for branches/alta/mystic-0.2a1/scipy_bfgs.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_bfgs.py (modified) (2 diffs)

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

@@ -60 +60 @@
 
 from _scipyoptimize import zoom, _cubicmin, _quadmin, _epsilon
-from _scipyoptimize import line_search, approx_fprime
+from _scipyoptimize import linesearch, line_search, approx_fprime
 
 ##########################################################################
@@ -217 +217 @@
             pk = -numpy.dot(Hk,gfk)
 
-            # If user has scipy installed, use that line search (since line search requires
-            # minpack.so). If scipy is not installed, use
-            # the function line_search (defined above, in helper functions)
-            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)
-            except ImportError:
-                alpha_k = None
-            #XXX If it gets stuck in the linesearch in scipy, 'exit' in the signal 
-            # handler does not work.
+            alpha_k, fc, gc, old_fval, old_old_fval, gfkp1 = \
+                             linesearch.line_search(func,myfprime,xk,pk,gfk, \
+                             old_fval,old_old_fval)
+            #XXX If it gets stuck in the linesearch in scipy,
+            # 'exit' in the signal handler does not work.
             #alpha_k = None