Changeset 945


Ignore:
Timestamp:
May 16, 2008 4:30:51 PM (11 years ago)
Author:
jpgoncal
Message:

Added two new versions of diving heuristics.

Location:
trunk/Cbc/src
Files:
4 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.am

    r912 r945  
    3939        CbcHeuristicDiveFractional.cpp CbcHeuristicDiveFractional.hpp \
    4040        CbcHeuristicDiveGuided.cpp CbcHeuristicDiveGuided.hpp \
     41        CbcHeuristicDiveLineSearch.cpp CbcHeuristicDiveLineSearch.hpp \
     42        CbcHeuristicDivePseudoCost.cpp CbcHeuristicDivePseudoCost.hpp \
    4143        CbcHeuristicDiveVectorLength.cpp CbcHeuristicDiveLength.hpp \
    4244        CbcHeuristicFPump.cpp CbcHeuristicFPump.hpp \
     
    312314        CbcHeuristicDiveFractional.hpp \
    313315        CbcHeuristicDiveGuided.hpp \
     316        CbcHeuristicDiveLineSearch.hpp \
     317        CbcHeuristicDivePseudoCost.hpp \
    314318        CbcHeuristicDiveVectorLength.hpp \
    315319        CbcHeuristicFPump.hpp \
  • trunk/Cbc/src/Makefile.in

    r912 r945  
    164164        CbcHeuristicDive.lo CbcHeuristicDiveCoefficient.lo \
    165165        CbcHeuristicDiveFractional.lo CbcHeuristicDiveGuided.lo \
     166        CbcHeuristicDiveLineSearch.lo CbcHeuristicDivePseudoCost.lo \
    166167        CbcHeuristicDiveVectorLength.lo CbcHeuristicFPump.lo \
    167168        CbcHeuristicGreedy.lo CbcHeuristicLocal.lo CbcHeuristicRINS.lo \
     
    514515        CbcHeuristicDiveFractional.cpp CbcHeuristicDiveFractional.hpp \
    515516        CbcHeuristicDiveGuided.cpp CbcHeuristicDiveGuided.hpp \
     517        CbcHeuristicDiveLineSearch.cpp CbcHeuristicDiveLineSearch.hpp \
     518        CbcHeuristicDivePseudoCost.cpp CbcHeuristicDivePseudoCost.hpp \
    516519        CbcHeuristicDiveVectorLength.cpp CbcHeuristicDiveLength.hpp \
    517520        CbcHeuristicFPump.cpp CbcHeuristicFPump.hpp \
     
    655658        CbcHeuristicDiveFractional.hpp \
    656659        CbcHeuristicDiveGuided.hpp \
     660        CbcHeuristicDiveLineSearch.hpp \
     661        CbcHeuristicDivePseudoCost.hpp \
    657662        CbcHeuristicDiveVectorLength.hpp \
    658663        CbcHeuristicFPump.hpp \
     
    812817@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveFractional.Plo@am__quote@
    813818@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveGuided.Plo@am__quote@
     819@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveLineSearch.Plo@am__quote@
     820@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDivePseudoCost.Plo@am__quote@
    814821@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveVectorLength.Plo@am__quote@
    815822@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicFPump.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.