Ignore:
Timestamp:
Nov 25, 2009 12:58:07 PM (10 years ago)
Author:
EdwinStraver
Message:

Broke up CbcCompareActual?.cpp into CbcCompareDepth?, CbcCompareDefault?, CbcCompareObjective? and CbcCompareEstimate?.
Carved CbcCutModifier? and CbcCutSubsetModifier? out of CbcCutGenerator?.
Updated spreadsheets.

File:
1 edited

Legend:

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

    r1313 r1314  
    165165        CbcBranchDefaultDecision.lo CbcBranchDynamic.lo \
    166166        CbcBranchingObject.lo CbcBranchLotsize.lo \
    167         CbcBranchToFixLots.lo CbcCompareActual.lo CbcConsequence.lo \
     167        CbcBranchToFixLots.lo CbcCompareDefault.lo CbcCompareDepth.lo \
     168        CbcCompareEstimate.lo CbcCompareObjective.lo CbcConsequence.lo \
    168169        CbcClique.lo CbcCliqueBranchingObject.lo \
    169170        CbcLongCliqueBranchingObject.lo CbcCountRowCut.lo \
    170         CbcCutBranchingObject.lo CbcCutGenerator.lo \
    171         CbcDummyBranchingObject.lo \
     171        CbcCutBranchingObject.lo CbcCutGenerator.lo CbcCutModifier.lo \
     172        CbcCutSubsetModifier.lo CbcDummyBranchingObject.lo \
    172173        CbcDynamicPseudoCostBranchingObject.lo CbcEventHandler.lo \
    173174        CbcFathom.lo CbcFathomDynamicProgramming.lo \
     
    534535        CbcBranchLotsize.cpp CbcBranchLotsize.hpp \
    535536        CbcBranchToFixLots.cpp CbcBranchToFixLots.hpp \
    536         CbcCompareActual.cpp CbcCompareActual.hpp \
     537        CbcCompareActual.hpp \
    537538        CbcCompareBase.hpp \
     539        CbcCompareDefault.cpp CbcCompareDefault.hpp \
     540        CbcCompareDepth.cpp CbcCompareDepth.hpp \
     541        CbcCompareEstimate.cpp CbcCompareEstimate.hpp \
     542        CbcCompareObjective.cpp CbcCompareObjective.hpp \
    538543        CbcConsequence.cpp CbcConsequence.hpp \
    539544        CbcChooseVariable.hpp \
     
    545550        CbcCutBranchingObject.cpp CbcCutBranchingObject.hpp \
    546551        CbcCutGenerator.cpp CbcCutGenerator.hpp \
     552        CbcCutModifier.cpp CbcCutModifier.hpp \
     553        CbcCutSubsetModifier.cpp CbcCutSubsetModifier.hpp \
    547554        CbcDummyBranchingObject.cpp CbcDummyBranchingObject.hpp \
    548555        CbcDynamicPseudoCostBranchingObject.cpp CbcDynamicPseudoCostBranchingObject.hpp \
     
    722729        CbcBranchToFixLots.hpp \
    723730        CbcCompareActual.hpp \
     731        CbcCompareDefault.hpp \
     732        CbcCompareDepth.hpp \
     733        CbcCompareEstimate.hpp \
     734        CbcCompareObjective.hpp \
    724735        CbcConsequence.hpp \
    725736        CbcChooseVariable.hpp \
     
    729740        CbcCutBranchingObject.hpp \
    730741        CbcCutGenerator.hpp \
     742        CbcCutModifier.hpp \
     743        CbcCutSubsetModifier.hpp \
    731744        CbcDummyBranchingObject.hpp \
    732745        CbcDynamicPseudoCostBranchingObject.hpp \
     
    906919@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcClique.Plo@am__quote@
    907920@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCliqueBranchingObject.Plo@am__quote@
    908 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareActual.Plo@am__quote@
     921@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareDefault.Plo@am__quote@
     922@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareDepth.Plo@am__quote@
     923@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareEstimate.Plo@am__quote@
     924@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareObjective.Plo@am__quote@
    909925@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcConsequence.Plo@am__quote@
    910926@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCountRowCut.Plo@am__quote@
    911927@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCutBranchingObject.Plo@am__quote@
    912928@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCutGenerator.Plo@am__quote@
     929@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCutModifier.Plo@am__quote@
     930@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCutSubsetModifier.Plo@am__quote@
    913931@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcDummyBranchingObject.Plo@am__quote@
    914932@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcDynamicPseudoCostBranchingObject.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.