Changeset 1157

Show
Ignore:
Timestamp:
07/22/08 09:29:54 (4 months ago)
Author:
dmitrey.kroshko
Message:

minor bugfix for scipy_tnc connection

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openopt/scikits/openopt/solvers/scipy_optim/scipy_tnc_oo.py

    r1091 r1157  
    3131            return 
    3232 
    33         xf, nfeval, rc = fmin_tnc(p.f, x0 = p.x0, fprime=p.df, args=(), approx_grad=0, bounds=bounds, messages=messages, maxfun=p.maxFunEvals, ftol=p.ftol, xtol=p.xtol, pgtol=p.gradtol) 
     33        maxfun=p.maxFunEvals 
     34        if maxfun > 1e8: 
     35            p.warn('tnc cannot handle maxFunEvals > 1e8, the value will be used') 
     36            maxfun = int(1e8) 
     37 
     38        xf, nfeval, rc = fmin_tnc(p.f, x0 = p.x0, fprime=p.df, args=(), approx_grad=0, bounds=bounds, messages=messages, maxfun=maxfun, ftol=p.ftol, xtol=p.xtol, pgtol=p.gradtol) 
    3439 
    3540        if rc in (INFEASIBLE, NOPROGRESS): istop = FAILED_WITH_UNIMPLEMENTED_OR_UNKNOWN_REASON