Ignore:
Timestamp:
Dec 3, 2009 2:36:52 PM (10 years ago)
Author:
EdwinStraver
Message:

Combined CbcClique? with CbcCliqueBranchingObject? and CbcLongCliqueBranchingObject?.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/Makefile.in

    r1314 r1344  
    167167        CbcBranchToFixLots.lo CbcCompareDefault.lo CbcCompareDepth.lo \
    168168        CbcCompareEstimate.lo CbcCompareObjective.lo CbcConsequence.lo \
    169         CbcClique.lo CbcCliqueBranchingObject.lo \
    170         CbcLongCliqueBranchingObject.lo CbcCountRowCut.lo \
    171         CbcCutBranchingObject.lo CbcCutGenerator.lo CbcCutModifier.lo \
    172         CbcCutSubsetModifier.lo CbcDummyBranchingObject.lo \
     169        CbcClique.lo CbcCountRowCut.lo CbcCutBranchingObject.lo \
     170        CbcCutGenerator.lo CbcCutModifier.lo CbcCutSubsetModifier.lo \
     171        CbcDummyBranchingObject.lo \
    173172        CbcDynamicPseudoCostBranchingObject.lo CbcEventHandler.lo \
    174173        CbcFathom.lo CbcFathomDynamicProgramming.lo \
     
    544543        CbcChooseVariable.hpp \
    545544        CbcClique.cpp CbcClique.hpp \
    546         CbcCliqueBranchingObject.cpp CbcCliqueBranchingObject.hpp \
    547         CbcLongCliqueBranchingObject.cpp CbcLongCliqueBranchingObject.hpp \
    548545        CbcCompare.hpp \
    549546        CbcCountRowCut.cpp CbcCountRowCut.hpp \
     
    736733        CbcChooseVariable.hpp \
    737734        CbcClique.hpp \
    738         CbcCliqueBranchingObject.hpp \
    739735        CbcCompare.hpp \
    740736        CbcCutBranchingObject.hpp \
     
    770766        CbcIntegerBranchingObject.hpp \
    771767        CbcIntegerPseudoCostBranchingObject.hpp \
    772         CbcLongCliqueBranchingObject.hpp \
    773768        CbcLotsize.hpp \
    774769        CbcMessage.hpp \
     
    918913@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCbcParam.Plo@am__quote@
    919914@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcClique.Plo@am__quote@
    920 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCliqueBranchingObject.Plo@am__quote@
    921915@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareDefault.Plo@am__quote@
    922916@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareDepth.Plo@am__quote@
     
    970964@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcIntegerPseudoCostBranchingObject.Plo@am__quote@
    971965@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcLinked.Plo@am__quote@
    972 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcLongCliqueBranchingObject.Plo@am__quote@
    973966@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcLotsize.Plo@am__quote@
    974967@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcMessage.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.