Ignore:
Timestamp:
Apr 10, 2008 1:55:10 PM (13 years ago)
Author:
ladanyi
Message:

Incorporated changes from branches/heur

File:
1 edited

Legend:

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

    r871 r912  
    162162        CbcCutGenerator.lo CbcEventHandler.lo CbcFathom.lo \
    163163        CbcFathomDynamicProgramming.lo CbcHeuristic.lo \
    164         CbcHeuristicDiveCoefficient.lo CbcHeuristicDiveFractional.lo \
    165         CbcHeuristicDiveGuided.lo CbcHeuristicDiveVectorLength.lo \
    166         CbcHeuristicFPump.lo CbcHeuristicGreedy.lo \
    167         CbcHeuristicLocal.lo CbcHeuristicRINS.lo CbcMessage.lo \
    168         CbcModel.lo CbcNode.lo CbcStatistics.lo CbcStrategy.lo \
    169         CbcTree.lo CbcTreeLocal.lo
     164        CbcHeuristicDive.lo CbcHeuristicDiveCoefficient.lo \
     165        CbcHeuristicDiveFractional.lo CbcHeuristicDiveGuided.lo \
     166        CbcHeuristicDiveVectorLength.lo CbcHeuristicFPump.lo \
     167        CbcHeuristicGreedy.lo CbcHeuristicLocal.lo CbcHeuristicRINS.lo \
     168        CbcMessage.lo CbcModel.lo CbcNode.lo CbcStatistics.lo \
     169        CbcStrategy.lo CbcTree.lo CbcTreeLocal.lo
    170170libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    171171libCbcSolver_la_LIBADD =
     
    510510        CbcFeasibilityBase.hpp \
    511511        CbcHeuristic.cpp CbcHeuristic.hpp \
     512        CbcHeuristicDive.cpp CbcHeuristicDive.hpp \
    512513        CbcHeuristicDiveCoefficient.cpp CbcHeuristicDiveCoefficient.hpp \
    513514        CbcHeuristicDiveFractional.cpp CbcHeuristicDiveFractional.hpp \
     
    650651        CbcFeasibilityBase.hpp \
    651652        CbcHeuristic.hpp \
     653        CbcHeuristicDive.hpp \
    652654        CbcHeuristicDiveCoefficient.hpp \
    653655        CbcHeuristicDiveFractional.hpp \
     
    806808@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGeneric.Po@am__quote@
    807809@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristic.Plo@am__quote@
     810@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDive.Plo@am__quote@
    808811@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveCoefficient.Plo@am__quote@
    809812@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveFractional.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.