Ignore:
Timestamp:
Nov 12, 2009 6:35:44 PM (10 years ago)
Author:
EdwinStraver
Message:

Broke up the objects form CbcBranchBase?

File:
1 edited

Legend:

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

    r1299 r1301  
    161161LTLIBRARIES = $(lib_LTLIBRARIES)
    162162libCbc_la_LIBADD =
    163 am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchBase.lo \
    164         CbcBranchCut.lo CbcBranchDefaultDecision.lo \
    165         CbcBranchDynamic.lo CbcBranchLotsize.lo CbcCompareActual.lo \
    166         CbcClique.lo CbcCliqueBranchingObject.lo \
    167         CbcLongCliqueBranchingObject.lo CbcCountRowCut.lo \
    168         CbcCutGenerator.lo CbcDummyBranchingObject.lo \
    169         CbcEventHandler.lo CbcFathom.lo CbcFathomDynamicProgramming.lo \
    170         CbcFixingBranchingObject.lo CbcFixVariable.lo CbcFollowOn.lo \
    171         CbcGeneral.lo CbcGeneralBranchingObject.lo CbcGeneralDepth.lo \
     163am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchCut.lo \
     164        CbcBranchDecision.lo CbcBranchDefaultDecision.lo \
     165        CbcBranchDynamic.lo CbcBranchingObject.lo CbcBranchLotsize.lo \
     166        CbcCompareActual.lo CbcConsequence.lo CbcClique.lo \
     167        CbcCliqueBranchingObject.lo CbcLongCliqueBranchingObject.lo \
     168        CbcCountRowCut.lo CbcCutGenerator.lo \
     169        CbcDummyBranchingObject.lo CbcEventHandler.lo CbcFathom.lo \
     170        CbcFathomDynamicProgramming.lo CbcFixingBranchingObject.lo \
     171        CbcFixVariable.lo CbcFollowOn.lo CbcGeneral.lo \
     172        CbcGeneralBranchingObject.lo CbcGeneralDepth.lo \
    172173        CbcHeuristic.lo CbcHeuristicDive.lo \
    173174        CbcHeuristicDiveCoefficient.lo CbcHeuristicDiveFractional.lo \
     
    180181        CbcIntegerPseudoCostBranchingObject.lo CbcMessage.lo \
    181182        CbcModel.lo CbcNode.lo CbcNWay.lo CbcNWayBranchingObject.lo \
     183        CbcObject.lo CbcObjectUpdateData.lo \
    182184        CbcOneGeneralBranchingObject.lo CbcSimpleInteger.lo \
    183185        CbcSimpleIntegerPseudoCost.lo CbcSOS.lo \
     
    518520        CbcConfig.h \
    519521        CbcBranchActual.hpp \
    520         CbcBranchBase.cpp CbcBranchBase.hpp \
     522        CbcBranchBase.hpp \
    521523        CbcBranchCut.cpp CbcBranchCut.hpp \
     524        CbcBranchDecision.cpp CbcBranchDecision.hpp \
    522525        CbcBranchDefaultDecision.cpp CbcBranchDefaultDecision.hpp \
    523526        CbcBranchDynamic.cpp CbcBranchDynamic.hpp \
     527        CbcBranchingObject.cpp CbcBranchingObject.hpp \
    524528        CbcBranchLotsize.cpp CbcBranchLotsize.hpp \
    525529        CbcCompareActual.cpp CbcCompareActual.hpp \
    526530        CbcCompareBase.hpp \
     531        CbcConsequence.cpp CbcConsequence.hpp \
    527532        CbcChooseVariable.hpp \
    528533        CbcClique.cpp CbcClique.hpp \
     
    565570        CbcNWay.cpp CbcNWay.hpp \
    566571        CbcNWayBranchingObject.cpp CbcNWayBranchingObject.hpp \
     572        CbcObject.cpp CbcObject.hpp \
     573        CbcObjectUpdateData.cpp CbcObjectUpdateData.hpp \
    567574        CbcOneGeneralBranchingObject.cpp CbcOneGeneralBranchingObject.hpp \
    568575        CbcSimpleInteger.cpp CbcSimpleInteger.hpp \
     
    695702        CbcBranchLotsize.hpp \
    696703        CbcBranchCut.hpp \
     704        CbcBranchDecision.hpp \
    697705        CbcBranchDefaultDecision.hpp \
     706        CbcBranchingObject.hpp \
    698707        CbcCompareActual.hpp \
    699         CbcCompareBase.hpp \
     708        CbcConsequence.hpp \
    700709        CbcChooseVariable.hpp \
    701710        CbcClique.hpp \
     
    735744        CbcNWay.hpp \
    736745        CbcNWayBranchingObject.hpp \
     746        CbcObject.hpp \
     747        CbcObjectUpdateData.hpp \
    737748        CbcOneGeneralBranchingObject.hpp \
    738749        CbcSimpleInteger.hpp \
     
    861872        -rm -f *.tab.c
    862873
    863 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchBase.Plo@am__quote@
    864874@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchCut.Plo@am__quote@
     875@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchDecision.Plo@am__quote@
    865876@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchDefaultDecision.Plo@am__quote@
    866877@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchDynamic.Plo@am__quote@
    867878@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchLotsize.Plo@am__quote@
     879@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcBranchingObject.Plo@am__quote@
    868880@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCbcParam.Plo@am__quote@
    869881@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcClique.Plo@am__quote@
    870882@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCliqueBranchingObject.Plo@am__quote@
    871883@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareActual.Plo@am__quote@
     884@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcConsequence.Plo@am__quote@
    872885@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCountRowCut.Plo@am__quote@
    873886@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCutGenerator.Plo@am__quote@
     
    917930@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNWayBranchingObject.Plo@am__quote@
    918931@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNode.Plo@am__quote@
     932@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcObject.Plo@am__quote@
     933@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcObjectUpdateData.Plo@am__quote@
    919934@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcOneGeneralBranchingObject.Plo@am__quote@
    920935@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSOS.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.