Changeset 1299 for branches/sandbox


Ignore:
Timestamp:
Nov 10, 2009 6:58:14 PM (10 years ago)
Author:
bjarni
Message:

Final fix on the Makefile.am, now sandbox compiles ok

Location:
branches/sandbox/Cbc/src
Files:
2 edited

Legend:

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

    r1298 r1299  
    2727        CbcBranchDynamic.cpp CbcBranchDynamic.hpp \
    2828        CbcBranchLotsize.cpp CbcBranchLotsize.hpp \
    29         CbcCompareActual.hpp \
     29        CbcCompareActual.cpp CbcCompareActual.hpp \
    3030        CbcCompareBase.hpp \
    3131        CbcChooseVariable.hpp \
    3232        CbcClique.cpp CbcClique.hpp \
    33         CbcCliqueBranchingObject.cpp CbcCliqueBranchingObject.hpp
     33        CbcCliqueBranchingObject.cpp CbcCliqueBranchingObject.hpp \
     34        CbcLongCliqueBranchingObject.cpp CbcLongCliqueBranchingObject.hpp \
    3435        CbcCompare.hpp \
    3536        CbcCountRowCut.cpp CbcCountRowCut.hpp \
  • branches/sandbox/Cbc/src/Makefile.in

    r1298 r1299  
    163163am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchBase.lo \
    164164        CbcBranchCut.lo CbcBranchDefaultDecision.lo \
    165         CbcBranchDynamic.lo CbcBranchLotsize.lo CbcClique.lo \
    166         CbcCliqueBranchingObject.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 \
     172        CbcHeuristic.lo CbcHeuristicDive.lo \
     173        CbcHeuristicDiveCoefficient.lo CbcHeuristicDiveFractional.lo \
     174        CbcHeuristicDiveGuided.lo CbcHeuristicDiveLineSearch.lo \
     175        CbcHeuristicDivePseudoCost.lo CbcHeuristicDiveVectorLength.lo \
     176        CbcHeuristicFPump.lo CbcHeuristicGreedy.lo \
     177        CbcHeuristicLocal.lo CbcHeuristicPivotAndFix.lo \
     178        CbcHeuristicRandRound.lo CbcHeuristicRINS.lo \
     179        CbcIntegerBranchingObject.lo \
     180        CbcIntegerPseudoCostBranchingObject.lo CbcMessage.lo \
     181        CbcModel.lo CbcNode.lo CbcNWay.lo CbcNWayBranchingObject.lo \
     182        CbcOneGeneralBranchingObject.lo CbcSimpleInteger.lo \
     183        CbcSimpleIntegerPseudoCost.lo CbcSOS.lo \
     184        CbcSOSBranchingObject.lo CbcStatistics.lo CbcStrategy.lo \
     185        CbcSubProblem.lo CbcTree.lo CbcTreeLocal.lo
    167186libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
    168187libCbcSolver_la_LIBADD =
     
    504523        CbcBranchDynamic.cpp CbcBranchDynamic.hpp \
    505524        CbcBranchLotsize.cpp CbcBranchLotsize.hpp \
    506         CbcCompareActual.hpp \
     525        CbcCompareActual.cpp CbcCompareActual.hpp \
    507526        CbcCompareBase.hpp \
    508527        CbcChooseVariable.hpp \
    509528        CbcClique.cpp CbcClique.hpp \
    510         CbcCliqueBranchingObject.cpp CbcCliqueBranchingObject.hpp
     529        CbcCliqueBranchingObject.cpp CbcCliqueBranchingObject.hpp \
     530        CbcLongCliqueBranchingObject.cpp CbcLongCliqueBranchingObject.hpp \
     531        CbcCompare.hpp \
     532        CbcCountRowCut.cpp CbcCountRowCut.hpp \
     533        CbcCutGenerator.cpp CbcCutGenerator.hpp \
     534        CbcDummyBranchingObject.cpp CbcDummyBranchingObject.hpp \
     535        CbcEventHandler.cpp CbcEventHandler.hpp \
     536        CbcFathom.cpp CbcFathom.hpp \
     537        CbcFathomDynamicProgramming.cpp CbcFathomDynamicProgramming.hpp \
     538        CbcFeasibilityBase.hpp \
     539        CbcFixingBranchingObject.cpp CbcFixingBranchingObject.hpp \
     540        CbcFixVariable.cpp CbcFixVariable.hpp \
     541        CbcFollowOn.cpp CbcFollowOn.hpp \
     542        CbcGeneral.cpp CbcGeneral.hpp \
     543        CbcGeneralBranchingObject.cpp CbcGeneralBranchingObject.hpp \
     544        CbcGeneralDepth.cpp CbcGeneralDepth.hpp \
     545        CbcHeuristic.cpp CbcHeuristic.hpp \
     546        CbcHeuristicDive.cpp CbcHeuristicDive.hpp \
     547        CbcHeuristicDiveCoefficient.cpp CbcHeuristicDiveCoefficient.hpp \
     548        CbcHeuristicDiveFractional.cpp CbcHeuristicDiveFractional.hpp \
     549        CbcHeuristicDiveGuided.cpp CbcHeuristicDiveGuided.hpp \
     550        CbcHeuristicDiveLineSearch.cpp CbcHeuristicDiveLineSearch.hpp \
     551        CbcHeuristicDivePseudoCost.cpp CbcHeuristicDivePseudoCost.hpp \
     552        CbcHeuristicDiveVectorLength.cpp CbcHeuristicDiveLength.hpp \
     553        CbcHeuristicFPump.cpp CbcHeuristicFPump.hpp \
     554        CbcHeuristicGreedy.cpp CbcHeuristicGreedy.hpp \
     555        CbcHeuristicLocal.cpp CbcHeuristicLocal.hpp \
     556        CbcHeuristicPivotAndFix.cpp CbcHeuristicPivotAndFix.hpp \
     557        CbcHeuristicRandRound.cpp CbcHeuristicRandRound.hpp \
     558        CbcHeuristicRINS.cpp CbcHeuristicRINS.hpp \
     559        CbcIntegerBranchingObject.cpp CbcIntegerBranchingObject.hpp \
     560        CbcIntegerPseudoCostBranchingObject.cpp \
     561        CbcIntegerPseudoCostBranchingObject.hpp \
     562        CbcMessage.cpp CbcMessage.hpp \
     563        CbcModel.cpp CbcModel.hpp \
     564        CbcNode.cpp CbcNode.hpp \
     565        CbcNWay.cpp CbcNWay.hpp \
     566        CbcNWayBranchingObject.cpp CbcNWayBranchingObject.hpp \
     567        CbcOneGeneralBranchingObject.cpp CbcOneGeneralBranchingObject.hpp \
     568        CbcSimpleInteger.cpp CbcSimpleInteger.hpp \
     569        CbcSimpleIntegerPseudoCost.cpp CbcSimpleIntegerPseudoCost.hpp \
     570        CbcSOS.cpp CbcSOS.hpp \
     571        CbcSOSBranchingObject.cpp CbcSOSBranchingObject.hpp \
     572        CbcStatistics.cpp CbcStatistics.hpp \
     573        CbcStrategy.cpp CbcStrategy.hpp \
     574        CbcSubProblem.cpp CbcSubProblem.hpp \
     575        CbcTree.cpp CbcTree.hpp \
     576        CbcTreeLocal.cpp CbcTreeLocal.hpp
    511577
    512578libCbcSolver_la_SOURCES = \
     
    803869@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcClique.Plo@am__quote@
    804870@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCliqueBranchingObject.Plo@am__quote@
     871@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCompareActual.Plo@am__quote@
     872@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCountRowCut.Plo@am__quote@
     873@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcCutGenerator.Plo@am__quote@
     874@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcDummyBranchingObject.Plo@am__quote@
     875@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcEventHandler.Plo@am__quote@
     876@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFathom.Plo@am__quote@
     877@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFathomDynamicProgramming.Plo@am__quote@
     878@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFixVariable.Plo@am__quote@
     879@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFixingBranchingObject.Plo@am__quote@
     880@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcFollowOn.Plo@am__quote@
    805881@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenBaB.Po@am__quote@
    806882@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenCbcParam.Po@am__quote@
     
    814890@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenSolution.Po@am__quote@
    815891@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGenSolvers.Po@am__quote@
     892@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGeneral.Plo@am__quote@
     893@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGeneralBranchingObject.Plo@am__quote@
     894@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGeneralDepth.Plo@am__quote@
    816895@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcGeneric.Po@am__quote@
     896@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristic.Plo@am__quote@
     897@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDive.Plo@am__quote@
     898@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveCoefficient.Plo@am__quote@
     899@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveFractional.Plo@am__quote@
     900@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveGuided.Plo@am__quote@
     901@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveLineSearch.Plo@am__quote@
     902@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDivePseudoCost.Plo@am__quote@
     903@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicDiveVectorLength.Plo@am__quote@
     904@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicFPump.Plo@am__quote@
     905@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicGreedy.Plo@am__quote@
     906@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicLocal.Plo@am__quote@
     907@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicPivotAndFix.Plo@am__quote@
     908@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicRINS.Plo@am__quote@
     909@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicRandRound.Plo@am__quote@
     910@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcIntegerBranchingObject.Plo@am__quote@
     911@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcIntegerPseudoCostBranchingObject.Plo@am__quote@
    817912@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcLinked.Plo@am__quote@
     913@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcLongCliqueBranchingObject.Plo@am__quote@
     914@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcMessage.Plo@am__quote@
     915@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcModel.Plo@am__quote@
     916@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNWay.Plo@am__quote@
     917@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNWayBranchingObject.Plo@am__quote@
     918@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcNode.Plo@am__quote@
     919@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcOneGeneralBranchingObject.Plo@am__quote@
     920@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSOS.Plo@am__quote@
     921@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSOSBranchingObject.Plo@am__quote@
     922@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSimpleInteger.Plo@am__quote@
     923@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSimpleIntegerPseudoCost.Plo@am__quote@
    818924@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSolver.Plo@am__quote@
     925@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStatistics.Plo@am__quote@
     926@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcStrategy.Plo@am__quote@
     927@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcSubProblem.Plo@am__quote@
     928@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcTree.Plo@am__quote@
     929@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcTreeLocal.Plo@am__quote@
    819930@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_C_Interface.Plo@am__quote@
    820931@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cbc_ampl.Plo@am__quote@
     
    10481159        uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
    10491160
    1050         CbcCompare.hpp \
    1051         CbcCountRowCut.cpp CbcCountRowCut.hpp \
    1052         CbcCutGenerator.cpp CbcCutGenerator.hpp \
    1053         CbcDummyBranchingObject.cpp CbcDummyBranchingObject.hpp \
    1054         CbcEventHandler.cpp CbcEventHandler.hpp \
    1055         CbcFathom.cpp CbcFathom.hpp \
    1056         CbcFathomDynamicProgramming.cpp CbcFathomDynamicProgramming.hpp \
    1057         CbcFeasibilityBase.hpp \
    1058         CbcFixingBranchingObject.cpp CbcFixingBranchingObject.hpp \
    1059         CbcFixVariable.cpp CbcFixVariable.hpp \
    1060         CbcFollowOn.cpp CbcFollowOn.hpp \
    1061         CbcGeneral.cpp CbcGeneral.hpp \
    1062         CbcGeneralBranchingObject.cpp CbcGeneralBranchingObject.hpp \
    1063         CbcGeneralDepth.cpp CbcGeneralDepth.hpp \
    1064         CbcHeuristic.cpp CbcHeuristic.hpp \
    1065         CbcHeuristicDive.cpp CbcHeuristicDive.hpp \
    1066         CbcHeuristicDiveCoefficient.cpp CbcHeuristicDiveCoefficient.hpp \
    1067         CbcHeuristicDiveFractional.cpp CbcHeuristicDiveFractional.hpp \
    1068         CbcHeuristicDiveGuided.cpp CbcHeuristicDiveGuided.hpp \
    1069         CbcHeuristicDiveLineSearch.cpp CbcHeuristicDiveLineSearch.hpp \
    1070         CbcHeuristicDivePseudoCost.cpp CbcHeuristicDivePseudoCost.hpp \
    1071         CbcHeuristicDiveVectorLength.cpp CbcHeuristicDiveLength.hpp \
    1072         CbcHeuristicFPump.cpp CbcHeuristicFPump.hpp \
    1073         CbcHeuristicGreedy.cpp CbcHeuristicGreedy.hpp \
    1074         CbcHeuristicLocal.cpp CbcHeuristicLocal.hpp \
    1075         CbcHeuristicPivotAndFix.cpp CbcHeuristicPivotAndFix.hpp \
    1076         CbcHeuristicRandRound.cpp CbcHeuristicRandRound.hpp \
    1077         CbcHeuristicRINS.cpp CbcHeuristicRINS.hpp \
    1078         CbcIntegerBranchingObject.cpp CbcIntegerBranchingObject.hpp \
    1079         CbcIntegerPseudoCostBranchingObject.cpp \
    1080         CbcIntegerPseudoCostBranchingObject.hpp \
    1081         CbcMessage.cpp CbcMessage.hpp \
    1082         CbcModel.cpp CbcModel.hpp \
    1083         CbcNode.cpp CbcNode.hpp \
    1084         CbcNWay.cpp CbcNWay.hpp \
    1085         CbcNWayBranchingObject.cpp CbcNWayBranchingObject.hpp \
    1086         CbcOneGeneralBranchingObject.cpp CbcOneGeneralBranchingObject.hpp \
    1087         CbcSimpleInteger.cpp CbcSimpleInteger.hpp \
    1088         CbcSimpleIntegerPseudoCost.cpp CbcSimpleIntegerPseudoCost.hpp \
    1089         CbcSOS.cpp CbcSOS.hpp \
    1090         CbcSOSBranchingObject.cpp CbcSOSBranchingObject.hpp \
    1091         CbcStatistics.cpp CbcStatistics.hpp \
    1092         CbcStrategy.cpp CbcStrategy.hpp \
    1093         CbcSubProblem.cpp CbcSubProblem.hpp \
    1094         CbcTree.cpp CbcTree.hpp \
    1095         CbcTreeLocal.cpp CbcTreeLocal.hpp
    10961161
    10971162install-exec-local:
Note: See TracChangeset for help on using the changeset viewer.