[Scipy-svn] r2057 - in trunk/Lib: optimize sandbox/netcdf

[scipy-svn at scipy.org]

Author: oliphant
Date: 2006-07-08 04:29:48 -0500 (Sat, 08 Jul 2006)
New Revision: 2057

Modified:
   trunk/Lib/optimize/linesearch.py
   trunk/Lib/optimize/optimize.py
   trunk/Lib/sandbox/netcdf/_netcdf.c
Log:
Make a few changes to optimize.

Modified: trunk/Lib/optimize/linesearch.py
===================================================================
--- trunk/Lib/optimize/linesearch.py	2006-07-08 02:23:05 UTC (rev 2056)
+++ trunk/Lib/optimize/linesearch.py	2006-07-08 09:29:48 UTC (rev 2057)
@@ -28,8 +28,8 @@
 
     xtol = 1e-14
     amin = 1e-8
-    isave = numpy.zeros((2,), numpy.int32)
-    dsave = numpy.zeros((13,), numpy.float64)
+    isave = numpy.zeros((2,), numpy.intc)
+    dsave = numpy.zeros((13,), float)
     task = 'START'
     fval = old_fval
     gval = gfk

Modified: trunk/Lib/optimize/optimize.py
===================================================================
--- trunk/Lib/optimize/optimize.py	2006-07-08 02:23:05 UTC (rev 2056)
+++ trunk/Lib/optimize/optimize.py	2006-07-08 09:29:48 UTC (rev 2057)
@@ -624,7 +624,7 @@
     gfk = myfprime(x0)
     k = 0
     N = len(x0)
-    I = numpy.eye(N)
+    I = numpy.eye(N,dtype=int)
     Hk = I
     old_fval = f(x0)
     old_old_fval = old_fval + 5000
@@ -644,8 +644,9 @@
                      line_search(f,myfprime,xk,pk,gfk,
                                  old_fval,old_old_fval)
             if alpha_k is None:
-                raise ValueError, "Line-search failing..."
-
+                # This line search also failed to find a better solution.
+                warnflag = 2
+                break                
         xkp1 = xk + alpha_k * pk
         if retall:
             allvecs.append(xkp1)
@@ -1579,7 +1580,7 @@
     Jout = vecfunc(*grid)
     Nshape = shape(Jout)
     indx = argmin(Jout.ravel())
-    Nindx = zeros(N)
+    Nindx = zeros(N,int)
     xmin = zeros(N,float)
     for k in range(N-1,-1,-1):
         thisN = Nshape[k]

Modified: trunk/Lib/sandbox/netcdf/_netcdf.c
===================================================================
--- trunk/Lib/sandbox/netcdf/_netcdf.c	2006-07-08 02:23:05 UTC (rev 2056)
+++ trunk/Lib/sandbox/netcdf/_netcdf.c	2006-07-08 09:29:48 UTC (rev 2057)
@@ -168,7 +168,7 @@
  */
 
 int data_types[] = {-1,  /* not used */
-		    PyArray_SBYTE,  /* signed 8-bit int */
+		    PyArray_BYTE,  /* signed 8-bit int */
 		    PyArray_CHAR,   /* 8-bit character */
 		    PyArray_SHORT,  /* 16-bit signed int */
 		    PyArray_INT,    /* 32-bit signed int */