Changeset 748

Show
Ignore:
Timestamp:
09/20/2010 07:45:24 PM (2 years ago)
Author:
dmitrey
Message:

doc fix: gradtol -> gtol

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • PythonPackages/OpenOpt/openopt/doc/badlyScaled.py

    r170 r748  
    1010x0 = [-4,4] 
    1111# even modification of stop criteria can't help to achieve the desired solution: 
    12 someModifiedStopCriteria = {'gradtol': 1e-15,  'ftol': 1e-13,  'xtol': 1e-13, 'maxIter': 1e3} 
     12someModifiedStopCriteria = {'gtol': 1e-15,  'ftol': 1e-13,  'xtol': 1e-13, 'maxIter': 1e3} 
    1313 
    1414# using default diffInt = 1e-7 is inappropriate: 
  • PythonPackages/OpenOpt/openopt/examples/nlp_1.py

    r208 r748  
    8484 
    8585# If you use solver algencan, NB! - it ignores xtol and ftol; using maxTime, maxCPUTime, maxIter, maxFunEvals, fEnough is recommended. 
    86 # Note that in algencan gradtol means norm of projected gradient of  the Augmented Lagrangian 
     86# Note that in algencan gtol means norm of projected gradient of  the Augmented Lagrangian 
    8787# so it should be something like 1e-3...1e-5 
    8888gtol = 1e-7 # (default gtol = 1e-6) 
  • PythonPackages/OpenOpt/openopt/examples/nlp_11.py

    r250 r748  
    9595 
    9696# If you use solver algencan, NB! - it ignores xtol and ftol; using maxTime, maxCPUTime, maxIter, maxFunEvals, fEnough is recommended. 
    97 # Note that in algencan gradtol means norm of projected gradient of  the Augmented Lagrangian 
     97# Note that in algencan gtol means norm of projected gradient of  the Augmented Lagrangian 
    9898# so it should be something like 1e-3...1e-5 
    9999gtol = 1e-7 # (default gtol = 1e-6) 
  • PythonPackages/OpenOpt/openopt/examples/nlp_3.py

    r170 r748  
    6464    p = NLP(f, x0, c=c, h=h, lb = lb, ub = ub, ftol = 1e-6, maxFunEvals = 1e7, maxIter = 1220, plot = 1, color = color, iprint = 0, legend = [solvers[j]], show= False, xlabel='time', goal='maximum', name='nlp3') 
    6565    if solver == 'algencan': 
    66         p.gradtol = 1e-1 
     66        p.gtol = 1e-1 
    6767    elif solver == 'ralg': 
    6868        p.debug = 1 
  • PythonPackages/OpenOpt/openopt/examples/nlp_ALGENCAN.py

    r249 r748  
    8787p.contol = 1e-3 # required constraints tolerance, default for NLP is 1e-6 
    8888 
    89 # for ALGENCAN solver gradtol is the only one stop criterium connected to openopt 
     89# for ALGENCAN solver gtol is the only one stop criterium connected to openopt 
    9090# (except maxfun, maxiter) 
    91 # Note that in ALGENCAN gradtol means norm of projected gradient of  the Augmented Lagrangian 
     91# Note that in ALGENCAN gtol means norm of projected gradient of  the Augmented Lagrangian 
    9292# so it should be something like 1e-3...1e-5 
    93 p.gradtol = 1e-5 # gradient stop criterium (default for NLP is 1e-6) 
     93p.gtol = 1e-5 # gradient stop criterium (default for NLP is 1e-6) 
    9494 
    9595 
  • PythonPackages/OpenOpt/openopt/examples/nlp_bench_2.py

    r170 r748  
    3838lb[3] = 5.5 
    3939ub[4] = 4.5 
    40 gradtol=1e-1 
     40gtol=1e-1 
    4141ftol = 1e-6 
    4242xtol = 1e-6 
     
    6060    solver = solvers[j] 
    6161    color = colors[j] 
    62     p = NLP(f, x0, name = 'bench2', df = df, c=c, dc = dc, h=h, dh = dh, lb = lb, ub = ub, gradtol=gradtol, ftol = ftol, maxFunEvals = 1e7, maxIter = maxIter, maxTime = maxTime,  plot = 1, color = color, iprint = 10, legend = [solvers[j]], show=False,  contol = contol) 
    63 #    p = NLP(f, x0, name = 'bench2', df = df, c=c, dc = dc, lb = lb, ub = ub, gradtol=gradtol, ftol = ftol, maxFunEvals = 1e7, maxIter = 1e4, maxTime = maxTime,  plot = 1, color = color, iprint = 0, legend = [solvers[j]], show=False,  contol = contol) 
     62    p = NLP(f, x0, name = 'bench2', df = df, c=c, dc = dc, h=h, dh = dh, lb = lb, ub = ub, gtol=gtol, ftol = ftol, maxFunEvals = 1e7, maxIter = maxIter, maxTime = maxTime,  plot = 1, color = color, iprint = 10, legend = [solvers[j]], show=False,  contol = contol) 
     63#    p = NLP(f, x0, name = 'bench2', df = df, c=c, dc = dc, lb = lb, ub = ub, gtol=gtol, ftol = ftol, maxFunEvals = 1e7, maxIter = 1e4, maxTime = maxTime,  plot = 1, color = color, iprint = 0, legend = [solvers[j]], show=False,  contol = contol) 
    6464    if solver[:4] == ['ralg']: 
    6565        pass 
    66 #        p.gradtol = 1e-8 
     66#        p.gtol = 1e-8 
    6767#        p.ftol = 1e-7 
    6868#        p.xtol = 1e-7 
  • PythonPackages/OpenOpt/openopt/tests/nlpLC.py

    r170 r748  
    5959 
    6060# If you use solver algencan, NB! - it ignores xtol and ftol; using maxTime, maxCPUTime, maxIter, maxFunEvals, fEnough is recommended. 
    61 # Note that in algencan gradtol means norm of projected gradient of  the Augmented Lagrangian 
     61# Note that in algencan gtol means norm of projected gradient of  the Augmented Lagrangian 
    6262# so it should be something like 1e-3...1e-5 
    6363gtol = 1e-7 # (default gtol = 1e-6)