Changeset 421

Timestamp:

08/26/10 14:25:50 (6 years ago)

Author:

mmckerns

Message:

cg & bfgs now work regardless if fprime provides list or ndarray

Location:

branches/alta/mystic-0.2a1

Files:

• scipy_bfgs.py (modified) (2 diffs)
• scipy_cg.py (modified) (2 diffs)

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

@@ -194 +194 @@
 
         x0 = constraints(x0) # impose constraints
-        gfk = myfprime(x0)
+        gfk = asarray(myfprime(x0))
         k = 0
         I = numpy.eye(self.nDim,dtype=int)
@@ -242 +242 @@
                 gfkp1 = myfprime(xkp1)
     
+            gfkp1 = asarray(gfkp1)
             yk = gfkp1 - gfk
             gfk = gfkp1

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

@@ -187 +187 @@
             gcalls, myfprime = wrap_function(fprime, args, Null)
 
-        gfk = myfprime(x0)
+        gfk = asarray(myfprime(x0))
         k = 0
         N = len(x0)
@@ -245 +245 @@
             if gfkp1 is None:
                 gfkp1 = myfprime(xk)
+            gfkp1 = asarray(gfkp1)
             yk = gfkp1 - gfk
             beta_k = max(0,numpy.dot(yk,gfkp1)/deltak)