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/Makefile.in

    r523 r542  
    5959        IpAlgBuilder.$(OBJEXT) IpAlgorithmRegOp.$(OBJEXT) \
    6060        IpAugRestoSystemSolver.$(OBJEXT) \
     61        IpBacktrackingLineSearch.$(OBJEXT) \
    6162        IpDefaultIterateInitializer.$(OBJEXT) IpFilter.$(OBJEXT) \
    62         IpFilterLineSearch.$(OBJEXT) IpGradientScaling.$(OBJEXT) \
     63        IpFilterLSAcceptor.$(OBJEXT) IpGradientScaling.$(OBJEXT) \
    6364        IpIpoptAlg.$(OBJEXT) IpIpoptCalculatedQuantities.$(OBJEXT) \
    6465        IpIpoptData.$(OBJEXT) IpIteratesVector.$(OBJEXT) \
     
    241242        IpAugRestoSystemSolver.cpp IpAugRestoSystemSolver.hpp \
    242243        IpAugSystemSolver.hpp \
     244        IpBacktrackingLSAcceptor.hpp \
     245        IpBacktrackingLineSearch.cpp IpBacktrackingLineSearch.hpp \
    243246        IpConvCheck.hpp \
    244247        IpDefaultIterateInitializer.cpp IpDefaultIterateInitializer.hpp \
    245248        IpEqMultCalculator.hpp \
    246249        IpFilter.cpp IpFilter.hpp \
    247         IpFilterLineSearch.cpp IpFilterLineSearch.hpp \
     250        IpFilterLSAcceptor.cpp IpFilterLSAcceptor.hpp \
    248251        IpGradientScaling.cpp IpGradientScaling.hpp \
    249252        IpIpoptAlg.cpp IpIpoptAlg.hpp \
     
    290293        IpAugRestoSystemSolver.cppbak IpAugRestoSystemSolver.hppbak \
    291294        IpAugSystemSolver.hppbak \
     295        IpBacktrackingLSAcceptor.hppbak \
     296        IpBacktrackingLineSearch.cppbak IpBacktrackingLineSearch.hppbak \
    292297        IpConvCheck.hppbak \
    293298        IpDefaultIterateInitializer.cppbak IpDefaultIterateInitializer.hppbak \
    294299        IpEqMultCalculator.hppbak \
    295300        IpFilter.cppbak IpFilter.hppbak \
    296         IpFilterLineSearch.cppbak IpFilterLineSearch.hppbak \
     301        IpFilterLSAcceptor.cppbak IpFilterLSAcceptor.hppbak \
    297302        IpGradientScaling.cppbak IpGradientScaling.hppbak \
    298303        IpIpoptAlg.cppbak IpIpoptAlg.hppbak \
     
    383388@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpAlgorithmRegOp.Po@am__quote@
    384389@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpAugRestoSystemSolver.Po@am__quote@
     390@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpBacktrackingLineSearch.Po@am__quote@
    385391@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpDefaultIterateInitializer.Po@am__quote@
    386392@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpFilter.Po@am__quote@
    387 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpFilterLineSearch.Po@am__quote@
     393@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpFilterLSAcceptor.Po@am__quote@
    388394@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpGradientScaling.Po@am__quote@
    389395@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpIpoptAlg.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.