Ignore:
Timestamp:
Oct 13, 2005 6:43:08 PM (14 years ago)
Author:
andreasw
Message:
  • cleaned up line search to allow for alternative globalization scheme
File:
1 edited

Legend:

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

    r490 r542  
    1010#include "IpCompoundVector.hpp"
    1111#include "IpRestoIpoptNLP.hpp"
     12#include "IpRestoPhase.hpp"
    1213
    1314namespace Ipopt
     
    1920  RestoFilterConvergenceCheck::RestoFilterConvergenceCheck()
    2021      :
    21       orig_filter_line_search_(NULL)
     22      orig_filter_ls_acceptor_(NULL)
    2223  {
    2324    DBG_START_FUN("RestoFilterConvergenceCheck::RestoFilterConvergenceCheck()",
     
    3334
    3435  void
    35   RestoFilterConvergenceCheck::SetOrigFilterLineSearch
    36   (const FilterLineSearch& orig_filter_line_search)
     36  RestoFilterConvergenceCheck::SetOrigFilterLSAcceptor
     37  (const FilterLSAcceptor& orig_filter_ls_acceptor)
    3738  {
    38     orig_filter_line_search_ = &orig_filter_line_search;
     39    orig_filter_ls_acceptor_ = &orig_filter_ls_acceptor;
    3940  }
    4041
     
    5455      const std::string& prefix)
    5556  {
    56     DBG_ASSERT(orig_filter_line_search_ && "Need to call RestoFilterConvergenceCheck::SetOrigFilterLineSearch before Initialize");
     57    DBG_ASSERT(orig_filter_ls_acceptor_ && "Need to call RestoFilterConvergenceCheck::SetOrigFilterLineSearch before Initialize");
    5758    options.GetNumericValue("required_infeasibility_reduction", kappa_resto_, prefix);
    5859    options.GetIntegerValue("max_iter", maximum_iters_, prefix);
     
    129130                     "orig_trial_barr = %8.2e\n", orig_trial_barr);
    130131
    131       if (!orig_filter_line_search_->IsAcceptableToCurrentFilter(orig_trial_barr, orig_trial_theta)) {
     132      if (!orig_filter_ls_acceptor_->IsAcceptableToCurrentFilter(orig_trial_barr, orig_trial_theta)) {
    132133        Jnlst().Printf(J_DETAILED, J_MAIN,
    133134                       "Point is not acceptable to the original filter.\n");
    134135        status = CONTINUE;
    135136      }
    136       else if (!orig_filter_line_search_->IsAcceptableToCurrentIterate(orig_trial_barr, orig_trial_theta, true) ) {
     137      else if (!orig_filter_ls_acceptor_->IsAcceptableToCurrentIterate(orig_trial_barr, orig_trial_theta, true) ) {
    137138        Jnlst().Printf(J_DETAILED, J_MAIN,
    138139                       "Point is not acceptable to the original current point.\n");
Note: See TracChangeset for help on using the changeset viewer.