[Scipy-svn] r6597 - trunk/scipy/optimize

[scipy-svn at scipy.org]

Author: rgommers
Date: 2010-07-11 10:27:53 -0500 (Sun, 11 Jul 2010)
New Revision: 6597

Modified:
   trunk/scipy/optimize/optimize.py
Log:
BUG: optimize.fmin_ncg failed to converge occasionally on Windows due to (==0.0) comparison. Fixes #1150.

(cherry-picked from r6587).

Modified: trunk/scipy/optimize/optimize.py
===================================================================
--- trunk/scipy/optimize/optimize.py	2010-07-11 08:00:16 UTC (rev 6596)
+++ trunk/scipy/optimize/optimize.py	2010-07-11 15:27:53 UTC (rev 6597)
@@ -1073,7 +1073,7 @@
             # check curvature
             Ap = asarray(Ap).squeeze() # get rid of matrices...
             curv = numpy.dot(psupi,Ap)
-            if curv == 0.0:
+            if 0 <= curv <= 3*numpy.finfo(numpy.float64).eps:
                 break
             elif curv < 0:
                 if (i > 0):