Ignore:
Timestamp:
Jul 29, 2005 3:11:41 PM (14 years ago)
Author:
andreasw
Message:
  • revised handling of "acceptable level of accuracy" (now in ConvCheck?)
  • fixed uncaught evaluation error exceptions
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Algorithm/IpRestoFilterConvCheck.cpp

    r411 r416  
    4242  void RestoFilterConvergenceCheck::RegisterOptions(SmartPtr<RegisteredOptions> roptions)
    4343  {
    44     roptions->AddBoundedNumberOption("kappa_resto", "???",
    45                                      0.0, false, 1.0, true, 0.9);
     44    roptions->AddBoundedNumberOption(
     45      "required_infeasibility_reduction",
     46      "Required reduction of infeasibility before restoration phase is left.",
     47      0.0, false, 1.0, true,
     48      0.9,
     49      "The restoration phase algorithm is performed, until a point is found "
     50      "that is acceptable to the filter and the infeasibility has been "
     51      "reduced by at least the fraction given by this option.");
    4652  }
    4753
     
    5056  {
    5157    DBG_ASSERT(orig_filter_line_search_ && "Need to call RestoFilterConvergenceCheck::SetOrigFilterLineSearch before Initialize");
    52     options.GetNumericValue("kappa_resto", kappa_resto_, prefix);
     58    options.GetNumericValue("required_infeasibility_reduction", kappa_resto_, prefix);
    5359    options.GetIntegerValue("max_iter", maximum_iters_, prefix);
    5460
     
    100106    Number orig_theta_max = Max(kappa_resto_*orig_curr_theta,
    101107                                1.e1*Min(orig_ip_data->tol(),
    102                                          orig_ip_data->primal_inf_tol()));
     108                                         constr_viol_tol_));
    103109
    104110    if (first_resto_iter_) {
     
    148154
    149155      status = OptimalityErrorConvergenceCheck::CheckConvergence();
    150       if (status == CONVERGED) {
     156      if (status == CONVERGED || status == CONVERGED_TO_ACCEPTABLE_POINT) {
    151157        Number orig_trial_primal_inf =
    152158          orig_ip_cq->trial_primal_infeasibility(NORM_MAX);
Note: See TracChangeset for help on using the changeset viewer.