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

    r507 r542  
    1313#include "IpAlgBuilder.hpp"
    1414#include "IpDefaultIterateInitializer.hpp"
    15 #include "IpFilterLineSearch.hpp"
     15#include "IpBacktrackingLineSearch.hpp"
     16#include "IpFilterLSAcceptor.hpp"
    1617#include "IpGradientScaling.hpp"
    1718#include "IpIpoptAlg.hpp"
     
    4546    AlgorithmBuilder::RegisterOptions(roptions);
    4647    roptions->SetRegisteringCategory("Line Search");
    47     FilterLineSearch::RegisterOptions(roptions);
     48    BacktrackingLineSearch::RegisterOptions(roptions);
     49    FilterLSAcceptor::RegisterOptions(roptions);
    4850    roptions->SetRegisteringCategory("NLP Scaling");
    4951    StandardScalingBase::RegisterOptions(roptions);
Note: See TracChangeset for help on using the changeset viewer.