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/IpAlgBuilder.cpp

    r517 r542  
    1414#include "IpPDPerturbationHandler.hpp"
    1515#include "IpOptErrorConvCheck.hpp"
    16 #include "IpFilterLineSearch.hpp"
     16#include "IpBacktrackingLineSearch.hpp"
     17#include "IpFilterLSAcceptor.hpp"
    1718#include "IpMonotoneMuUpdate.hpp"
    1819#include "IpAdaptiveMuUpdate.hpp"
     
    207208    SmartPtr<RestoRestorationPhase> resto_resto =
    208209      new RestoRestorationPhase();
    209     SmartPtr<FilterLineSearch> resto_LineSearch =
    210       new FilterLineSearch(GetRawPtr(resto_resto), GetRawPtr(resto_PDSolver),
    211                            GetRawPtr(resto_convCheck));
     210    SmartPtr<FilterLSAcceptor> resto_filterLSacceptor =
     211      new FilterLSAcceptor(GetRawPtr(resto_PDSolver));
     212    SmartPtr<LineSearch> resto_LineSearch =
     213      new BacktrackingLineSearch(GetRawPtr(resto_filterLSacceptor),
     214                                 GetRawPtr(resto_resto), GetRawPtr(resto_convCheck));
    212215
    213216    // Create the mu update that will be used by the restoration phase
     
    282285
    283286    // Create the line search to be used by the main algorithm
    284     SmartPtr<FilterLineSearch> lineSearch =
    285       new FilterLineSearch(GetRawPtr(resto_phase), GetRawPtr(PDSolver),
    286                            convCheck);
     287    SmartPtr<FilterLSAcceptor> filterLSacceptor =
     288      new FilterLSAcceptor(GetRawPtr(PDSolver));
     289    SmartPtr<LineSearch> lineSearch =
     290      new BacktrackingLineSearch(GetRawPtr(filterLSacceptor),
     291                                 GetRawPtr(resto_phase), convCheck);
    287292
    288293    // The following cross reference is not good: We have to store a
     
    290295    // non-SmartPtr to make sure that things are properly deleted when
    291296    // the IpoptAlgorithm return by the Builder is destructed.
    292     resto_convCheck->SetOrigFilterLineSearch(*lineSearch);
     297    resto_convCheck->SetOrigFilterLSAcceptor(*filterLSacceptor);
    293298
    294299    // Create the mu update that will be used by the main algorithm
Note: See TracChangeset for help on using the changeset viewer.