Changeset 1532
- Timestamp:
- 10/10/08 08:49:46 (2 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openopt/scikits/openopt/solvers/scipy_optim/scipy_bfgs_oo.py
r934 r1532 5 5 __name__ = 'scipy_bfgs' 6 6 __license__ = "BSD" 7 #__authors__ = 8 __alg__ = "BFGS" 7 #__authors__ = 8 __alg__ = "BFGS" 9 9 __info__ = 'unconstrained NLP solver' 10 10 __iterfcnConnected__ = True 11 11 12 12 def __init__(self):pass 13 13 def __solver__(self, p): 14 14 15 15 # try: 16 16 p.iterfcn(p.x0) 17 p.xk = p.xf = fmin_bfgs(p.f, p.x0, fprime=p.df, disp = 0, maxiter=p.maxIter, callback=p.iterfcn)17 p.xk = p.xf = fmin_bfgs(p.f, p.x0, fprime=p.df, disp = 0, gtol=p.gtol, maxiter=p.maxIter, callback=p.iterfcn) 18 18 p.istop = 1000 19 19 # except isSolved: 20 20 # xf = p.xk 21 # 21 # 22 22 # ff = p.f(xf) 23 23 # p.xk = p.xf = xf trunk/openopt/scikits/openopt/solvers/scipy_optim/scipy_cg_oo.py
r1379 r1532 20 20 21 21 try: 22 iterfcn(p.x0)23 22 xf = fmin_cg(p.f, p.x0, fprime=p.df, gtol=p.gtol, disp = 0, maxiter=p.maxIter, callback=iterfcn) 24 23 except isSolved: … … 29 28 p.fk = p.ff = ff 30 29 p.istop = 1000 31 p.iterfcn()30 #p.iterfcn() 32 31 trunk/openopt/scikits/openopt/solvers/scipy_optim/scipy_ncg_oo.py
r1100 r1532 21 21 else: fhess = None 22 22 23 xf = fmin_ncg(p.f, p.x0, p.df, fhess = fhess, maxiter = p.maxIter , disp = 0, callback=iterfcn)23 xf = fmin_ncg(p.f, p.x0, p.df, fhess = fhess, maxiter = p.maxIter+15, disp = 0, callback=iterfcn) 24 24 25 25 ff = p.f(xf) 26 p.istop = 1000 26 27 p.xk = p.xf = xf 27 28 p.fk = p.ff = ff
