Changeset 421
- Timestamp:
- 08/26/10 14:25:50 (6 years ago)
- Location:
- branches/alta/mystic-0.2a1
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/alta/mystic-0.2a1/scipy_bfgs.py
r420 r421 194 194 195 195 x0 = constraints(x0) # impose constraints 196 gfk = myfprime(x0)196 gfk = asarray(myfprime(x0)) 197 197 k = 0 198 198 I = numpy.eye(self.nDim,dtype=int) … … 242 242 gfkp1 = myfprime(xkp1) 243 243 244 gfkp1 = asarray(gfkp1) 244 245 yk = gfkp1 - gfk 245 246 gfk = gfkp1 -
branches/alta/mystic-0.2a1/scipy_cg.py
r420 r421 187 187 gcalls, myfprime = wrap_function(fprime, args, Null) 188 188 189 gfk = myfprime(x0)189 gfk = asarray(myfprime(x0)) 190 190 k = 0 191 191 N = len(x0) … … 245 245 if gfkp1 is None: 246 246 gfkp1 = myfprime(xk) 247 gfkp1 = asarray(gfkp1) 247 248 yk = gfkp1 - gfk 248 249 beta_k = max(0,numpy.dot(yk,gfkp1)/deltak)
Note: See TracChangeset
for help on using the changeset viewer.