Changeset 421 for branches/alta/mystic-0.2a1/scipy_cg.py

Timestamp:

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

Author:

mmckerns

Message:

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

File:

• branches/alta/mystic-0.2a1/scipy_cg.py (modified) (2 diffs)

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)