Ignore:
Timestamp:
Dec 4, 2009 10:01:00 AM (10 years ago)
Author:
EdwinStraver
Message:

Combined CbcSOS with CbcSOSBranchingObject
Combined CbcNWay with CbcNWayBranchingObject
Combined CbcFollowOn? with CbcFixingBranchingObject?

File:
1 edited

Legend:

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

    r1347 r1350  
    171171        CbcDummyBranchingObject.lo \
    172172        CbcDynamicPseudoCostBranchingObject.lo CbcEventHandler.lo \
    173         CbcFathom.lo CbcFathomDynamicProgramming.lo \
    174         CbcFixingBranchingObject.lo CbcFixVariable.lo \
     173        CbcFathom.lo CbcFathomDynamicProgramming.lo CbcFixVariable.lo \
    175174        CbcFullNodeInfo.lo CbcFollowOn.lo CbcGeneral.lo \
    176175        CbcGeneralDepth.lo CbcHeuristic.lo CbcHeuristicDive.lo \
     
    182181        CbcHeuristicRandRound.lo CbcHeuristicRINS.lo CbcLotsize.lo \
    183182        CbcMessage.lo CbcModel.lo CbcNode.lo CbcNodeInfo.lo CbcNWay.lo \
    184         CbcNWayBranchingObject.lo CbcObject.lo CbcObjectUpdateData.lo \
    185         CbcPartialNodeInfo.lo CbcSimpleInteger.lo \
    186         CbcSimpleIntegerDynamicPseudoCost.lo \
    187         CbcSimpleIntegerPseudoCost.lo CbcSOS.lo \
    188         CbcSOSBranchingObject.lo CbcStatistics.lo CbcStrategy.lo \
    189         CbcSubProblem.lo CbcTree.lo CbcTreeLocal.lo
     183        CbcObject.lo CbcObjectUpdateData.lo CbcPartialNodeInfo.lo \
     184        CbcSimpleInteger.lo CbcSimpleIntegerDynamicPseudoCost.lo \
     185        CbcSimpleIntegerPseudoCost.lo CbcSOS.lo CbcStatistics.lo \
     186        CbcStrategy.lo CbcSubProblem.lo CbcTree.lo CbcTreeLocal.lo
    190187libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    191188libCbcSolver_la_LIBADD =
     
    552549        CbcFathomDynamicProgramming.cpp CbcFathomDynamicProgramming.hpp \
    553550        CbcFeasibilityBase.hpp \
    554         CbcFixingBranchingObject.cpp CbcFixingBranchingObject.hpp \
    555551        CbcFixVariable.cpp CbcFixVariable.hpp \
    556552        CbcFullNodeInfo.cpp CbcFullNodeInfo.hpp \
     
    578574        CbcNodeInfo.cpp CbcNodeInfo.hpp \
    579575        CbcNWay.cpp CbcNWay.hpp \
    580         CbcNWayBranchingObject.cpp CbcNWayBranchingObject.hpp \
    581576        CbcObject.cpp CbcObject.hpp \
    582577        CbcObjectUpdateData.cpp CbcObjectUpdateData.hpp \
     
    586581        CbcSimpleIntegerPseudoCost.cpp CbcSimpleIntegerPseudoCost.hpp \
    587582        CbcSOS.cpp CbcSOS.hpp \
    588         CbcSOSBranchingObject.cpp CbcSOSBranchingObject.hpp \
    589583        CbcStatistics.cpp CbcStatistics.hpp \
    590584        CbcStrategy.cpp CbcStrategy.hpp \
     
    735729        CbcEventHandler.hpp \
    736730        CbcFeasibilityBase.hpp \
    737         CbcFixingBranchingObject.hpp \
    738731        CbcFixVariable.hpp \
    739732        CbcFollowOn.hpp \
     
    761754        CbcNodeInfo.hpp \
    762755        CbcNWay.hpp \
    763         CbcNWayBranchingObject.hpp \
    764756        CbcObject.hpp \
    765757        CbcObjectUpdateData.hpp \
     
    771763        CbcSolver.hpp \
    772764        CbcSOS.hpp \
    773         CbcSOSBranchingObject.hpp \
    774765        CbcSubProblem.hpp \
    775766        CbcTree.hpp \
     
    917908@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFathomDynamicProgramming.Plo@am__quote@
    918909@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFixVariable.Plo@am__quote@
    919 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFixingBranchingObject.Plo@am__quote@
    920910@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFollowOn.Plo@am__quote@
    921911@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFullNodeInfo.Plo@am__quote@
     
    953943@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcModel.Plo@am__quote@
    954944@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNWay.Plo@am__quote@
    955 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNWayBranchingObject.Plo@am__quote@
    956945@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNode.Plo@am__quote@
    957946@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNodeInfo.Plo@am__quote@
     
    960949@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcPartialNodeInfo.Plo@am__quote@
    961950@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSOS.Plo@am__quote@
    962 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSOSBranchingObject.Plo@am__quote@
    963951@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSimpleInteger.Plo@am__quote@
    964952@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSimpleIntegerDynamicPseudoCost.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.