[Scipy-svn] r6757 - trunk/scipy/optimize
scipy-svn at scipy.org
scipy-svn at scipy.org
Sat Sep 11 20:59:41 EDT 2010
Author: ptvirtan
Date: 2010-09-11 19:59:41 -0500 (Sat, 11 Sep 2010)
New Revision: 6757
Modified:
trunk/scipy/optimize/linesearch.py
Log:
3K: optimize: fix bytes issue in scalar_search_wolfe1
Modified: trunk/scipy/optimize/linesearch.py
===================================================================
--- trunk/scipy/optimize/linesearch.py 2010-09-12 00:59:29 UTC (rev 6756)
+++ trunk/scipy/optimize/linesearch.py 2010-09-12 00:59:41 UTC (rev 6757)
@@ -1,5 +1,6 @@
from scipy.optimize import minpack2
import numpy as np
+from numpy.compat import asbytes
__all__ = ['line_search_wolfe1', 'line_search_wolfe2',
'scalar_search_wolfe1', 'scalar_search_wolfe2',
@@ -138,20 +139,20 @@
derphi1 = derphi0
isave = np.zeros((2,), np.intc)
dsave = np.zeros((13,), float)
- task = 'START'
+ task = asbytes('START')
while 1:
stp, phi1, derphi1, task = minpack2.dcsrch(alpha1, phi1, derphi1,
c1, c2, xtol, task,
amin, amax, isave, dsave)
- if task[:2] == 'FG':
+ if task[:2] == asbytes('FG'):
alpha1 = stp
phi1 = phi(stp)
derphi1 = derphi(stp)
else:
break
- if task[:5] == 'ERROR' or task[:4] == 'WARN':
+ if task[:5] == asbytes('ERROR') or task[:4] == asbytes('WARN'):
stp = None # failed
return stp, phi1, phi0
More information about the Scipy-svn
mailing list