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.hpp

    r501 r542  
    1111
    1212#include "IpOptErrorConvCheck.hpp"
    13 #include "IpFilterLineSearch.hpp"
     13#include "IpFilterLSAcceptor.hpp"
    1414
    1515namespace Ipopt
     
    4747     *  method must be called to finish the definition of the
    4848     *  algorithm, before Initialize is called. */
    49     void SetOrigFilterLineSearch(const FilterLineSearch& orig_filter_line_search);
     49    void SetOrigFilterLSAcceptor(const FilterLSAcceptor& orig_filter_ls_acceptor);
    5050
    5151    /** overloaded from AlgorithmStrategyObject */
     
    9393     *  that prevent the destructor of the line search object to be
    9494     *  called! */
    95     const FilterLineSearch* orig_filter_line_search_;
     95    const FilterLSAcceptor* orig_filter_ls_acceptor_;
    9696  };
    9797
Note: See TracChangeset for help on using the changeset viewer.