Ignore:
Timestamp:
Nov 24, 2009 3:13:03 PM (10 years ago)
Author:
EdwinStraver
Message:

Created CbcNodeInfo?, CbcPartialNodeInfo? and CbcFullNodeInfo? out of CbcNode?.cpp
Also updated makefiles, and spreadsheets.

File:
1 edited

Legend:

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

    r1312 r1313  
    172172        CbcDynamicPseudoCostBranchingObject.lo CbcEventHandler.lo \
    173173        CbcFathom.lo CbcFathomDynamicProgramming.lo \
    174         CbcFixingBranchingObject.lo CbcFixVariable.lo CbcFollowOn.lo \
    175         CbcGeneral.lo CbcGeneralBranchingObject.lo CbcGeneralDepth.lo \
     174        CbcFixingBranchingObject.lo CbcFixVariable.lo \
     175        CbcFullNodeInfo.lo CbcFollowOn.lo CbcGeneral.lo \
     176        CbcGeneralBranchingObject.lo CbcGeneralDepth.lo \
    176177        CbcHeuristic.lo CbcHeuristicDive.lo \
    177178        CbcHeuristicDiveCoefficient.lo CbcHeuristicDiveFractional.lo \
     
    183184        CbcIntegerBranchingObject.lo \
    184185        CbcIntegerPseudoCostBranchingObject.lo CbcLotsize.lo \
    185         CbcMessage.lo CbcModel.lo CbcNode.lo CbcNWay.lo \
     186        CbcMessage.lo CbcModel.lo CbcNode.lo CbcNodeInfo.lo CbcNWay.lo \
    186187        CbcNWayBranchingObject.lo CbcObject.lo CbcObjectUpdateData.lo \
    187         CbcOneGeneralBranchingObject.lo CbcSimpleInteger.lo \
    188         CbcSimpleIntegerDynamicPseudoCost.lo \
     188        CbcOneGeneralBranchingObject.lo CbcPartialNodeInfo.lo \
     189        CbcSimpleInteger.lo CbcSimpleIntegerDynamicPseudoCost.lo \
    189190        CbcSimpleIntegerPseudoCost.lo CbcSOS.lo \
    190191        CbcSOSBranchingObject.lo CbcStatistics.lo CbcStrategy.lo \
     
    552553        CbcFixingBranchingObject.cpp CbcFixingBranchingObject.hpp \
    553554        CbcFixVariable.cpp CbcFixVariable.hpp \
     555        CbcFullNodeInfo.cpp CbcFullNodeInfo.hpp \
    554556        CbcFollowOn.cpp CbcFollowOn.hpp \
    555557        CbcGeneral.cpp CbcGeneral.hpp \
     
    577579        CbcModel.cpp CbcModel.hpp \
    578580        CbcNode.cpp CbcNode.hpp \
     581        CbcNodeInfo.cpp CbcNodeInfo.hpp \
    579582        CbcNWay.cpp CbcNWay.hpp \
    580583        CbcNWayBranchingObject.cpp CbcNWayBranchingObject.hpp \
     
    582585        CbcObjectUpdateData.cpp CbcObjectUpdateData.hpp \
    583586        CbcOneGeneralBranchingObject.cpp CbcOneGeneralBranchingObject.hpp \
     587        CbcPartialNodeInfo.cpp CbcPartialNodeInfo.hpp \
    584588        CbcSimpleInteger.cpp CbcSimpleInteger.hpp \
    585589        CbcSimpleIntegerDynamicPseudoCost.cpp CbcSimpleIntegerDynamicPseudoCost.hpp \
     
    733737        CbcFixVariable.hpp \
    734738        CbcFollowOn.hpp \
     739        CbcFullNodeInfo.hpp \
    735740        CbcGeneral.hpp \
    736741        CbcGeneralBranchingObject.hpp \
     
    757762        CbcModel.hpp \
    758763        CbcNode.hpp \
     764        CbcNodeInfo.hpp \
    759765        CbcNWay.hpp \
    760766        CbcNWayBranchingObject.hpp \
     
    762768        CbcObjectUpdateData.hpp \
    763769        CbcOneGeneralBranchingObject.hpp \
     770        CbcPartialNodeInfo.hpp \
    764771        CbcSimpleInteger.hpp \
    765772        CbcSimpleIntegerDynamicPseudoCost.hpp \
     
    912919@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFixingBranchingObject.Plo@am__quote@
    913920@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFollowOn.Plo@am__quote@
     921@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFullNodeInfo.Plo@am__quote@
    914922@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenBaB.Po@am__quote@
    915923@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenCbcParam.Po@am__quote@
     
    951959@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNWayBranchingObject.Plo@am__quote@
    952960@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNode.Plo@am__quote@
     961@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNodeInfo.Plo@am__quote@
    953962@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcObject.Plo@am__quote@
    954963@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcObjectUpdateData.Plo@am__quote@
    955964@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcOneGeneralBranchingObject.Plo@am__quote@
     965@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcPartialNodeInfo.Plo@am__quote@
    956966@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSOS.Plo@am__quote@
    957967@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSOSBranchingObject.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.