[coinor-cbc] 04/13: Merge branch 'master' into experimental
Anton Gladky
gladk at moszumanska.debian.org
Mon Jun 5 18:07:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository coinor-cbc.
commit 1997111daa6bd64b9f4c2a560ea286287bba5af7
Merge: f7174cf 8a64c36
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jun 5 19:45:02 2017 +0200
Merge branch 'master' into experimental
CbcSourceFilesTable.csv | 122 +-
CbcSourceFilesTable2.csv | 206 +-
MSVisualStudio/v10/Cbc.sln | 147 --
.../v10/CbcCSosDllSample/cbcCSosDllSample.vcxproj | 221 --
.../CbcWithInstalledLibraries/BaseCBCProject.sln | 20 -
.../BaseCBCProject.vcxproj | 88 -
.../v10/CbcWithInstalledLibraries/README.txt | 12 -
.../v10/CbcWithInstalledLibraries/main.cpp | 37 -
.../v10/OsiCbcUnitTest/OsiCbcUnitTest.vcxproj | 209 --
MSVisualStudio/v10/cbc/cbc.vcxproj | 263 --
.../v10/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj | 231 --
.../cbcExamplesSample2/cbcExamplesSample2.vcxproj | 326 ---
MSVisualStudio/v10/libCbc/libCbc.vcxproj | 687 -----
.../v10/libCbcSolver/libCbcSolver.vcxproj | 157 --
MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj | 146 --
MSVisualStudio/v9/Cbc.sln | 182 --
.../v9/OsiCbcUnitTest/OsiCbcUnitTest.vcproj | 359 ---
MSVisualStudio/v9/cbc/cbc.vcproj | 431 ----
.../v9/cbcCInterfaceDll/cbcCInterfaceDll.vcproj | 371 ---
.../v9/cbcCSosDllSample/cbcCSosDllSample.vcproj | 387 ---
.../cbcExamplesSample2/cbcExamplesSample2.vcproj | 807 ------
MSVisualStudio/v9/libCbc/libCbc.vcproj | 1916 --------------
MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj | 369 ---
MSVisualStudio/v9/libOsiCbc/libOsiCbc.vcproj | 316 ---
Makefile.am | 4 +-
Makefile.in | 107 +-
README | 378 ++-
configure | 478 +++-
configure.ac | 11 +-
examples/CbcBranchFollow2.cpp | 2 +-
examples/CbcBranchLink.cpp | 2 +-
examples/CbcBranchLink.hpp | 2 +-
examples/CbcBranchUser.cpp | 2 +-
examples/CbcCompareUser.cpp | 2 +-
examples/CbcSolver3.cpp | 2 +-
examples/CbcSolverLongThin.cpp | 2 +-
examples/Makefile.in | 2 +-
examples/allCuts.cpp | 2 +-
examples/barrier.cpp | 2 +-
examples/cbc_driverC_sos.c | 2 +-
examples/crew.cpp | 2 +-
examples/driver.cpp | 2 +-
examples/driver2.cpp | 2 +-
examples/driver3.cpp | 2 +-
examples/driver4.cpp | 106 +-
examples/{driver4.cpp => driver6.cpp} | 64 +-
examples/fast0507.cpp | 2 +-
examples/fast0507b.cpp | 2 +-
examples/gear.cpp | 2 +-
examples/hotstart.cpp | 2 +-
examples/interrupt.cpp | 2 +-
examples/link.cpp | 2 +-
examples/longthin.cpp | 2 +-
examples/lotsize.cpp | 2 +-
examples/minimum.cpp | 2 +-
examples/nway.cpp | 2 +-
examples/parallel2.cpp | 196 --
examples/pool.cpp | 98 +
examples/qmip.cpp | 2 +-
examples/qmip2.cpp | 2 +-
examples/repeat.cpp | 2 +-
examples/sample1.cpp | 2 +-
examples/sample2.cpp | 2 +-
examples/sample3.cpp | 2 +-
examples/sample4.cpp | 2 +-
examples/sample5.cpp | 2 +-
examples/simpleBAB.cpp | 2 +-
examples/sos.cpp | 2 +-
examples/sudoku.cpp | 2 +-
src/CbcBranchAllDifferent.cpp | 2 +-
src/CbcBranchAllDifferent.hpp | 2 +-
src/CbcBranchDecision.cpp | 2 +-
src/CbcBranchDecision.hpp | 2 +-
src/CbcBranchDefaultDecision.cpp | 2 +-
src/CbcBranchDefaultDecision.hpp | 2 +-
src/CbcBranchDynamic.cpp | 10 +-
src/CbcBranchLotsize.cpp | 2 +-
src/CbcBranchToFixLots.cpp | 2 +-
src/CbcBranchToFixLots.hpp | 2 +-
src/CbcBranchingObject.cpp | 2 +-
src/CbcBranchingObject.hpp | 2 +-
src/CbcCbcParam.cpp | 2 +-
src/CbcClique.cpp | 71 +-
src/CbcClique.hpp | 2 +-
src/CbcCompare.hpp | 2 +-
src/CbcCompareDefault.cpp | 2 +-
src/CbcCompareDefault.hpp | 2 +-
src/CbcCompareDepth.cpp | 2 +-
src/CbcCompareDepth.hpp | 2 +-
src/CbcCompareEstimate.cpp | 2 +-
src/CbcCompareEstimate.hpp | 2 +-
src/CbcCompareObjective.cpp | 2 +-
src/CbcCompareObjective.hpp | 2 +-
src/CbcConsequence.cpp | 2 +-
src/CbcConsequence.hpp | 2 +-
src/CbcCountRowCut.cpp | 81 +-
src/CbcCountRowCut.hpp | 6 +-
src/CbcCutGenerator.cpp | 115 +-
src/CbcCutGenerator.hpp | 17 +-
src/CbcCutModifier.cpp | 2 +-
src/CbcCutModifier.hpp | 2 +-
src/CbcCutSubsetModifier.cpp | 2 +-
src/CbcCutSubsetModifier.hpp | 2 +-
src/CbcDummyBranchingObject.cpp | 2 +-
src/CbcDummyBranchingObject.hpp | 2 +-
src/CbcEventHandler.cpp | 25 +-
src/CbcEventHandler.hpp | 23 +-
src/CbcFathom.hpp | 2 +-
src/CbcFathomDynamicProgramming.cpp | 2 +-
src/CbcFixVariable.cpp | 2 +-
src/CbcFixVariable.hpp | 2 +-
src/CbcFollowOn.cpp | 2 +-
src/CbcFollowOn.hpp | 2 +-
src/CbcFullNodeInfo.cpp | 24 +-
src/CbcFullNodeInfo.hpp | 2 +-
src/CbcGenBaB.cpp | 4 +-
src/CbcGenCbcParam.cpp | 4 +-
src/CbcGenCbcParam.hpp | 4 +-
src/CbcGenCbcParamUtils.cpp | 4 +-
src/CbcGenCtlBlk.cpp | 4 +-
src/CbcGenCtlBlk.hpp | 4 +-
src/CbcGenMessages.cpp | 4 +-
src/CbcGenMessages.hpp | 2 +-
src/CbcGenOsiParam.cpp | 4 +-
src/CbcGenOsiParam.hpp | 4 +-
src/CbcGenOsiParamUtils.cpp | 4 +-
src/CbcGenParam.cpp | 4 +-
src/CbcGenParam.hpp | 4 +-
src/CbcGenParamUtils.cpp | 4 +-
src/CbcGenSolution.cpp | 4 +-
src/CbcGenSolvers.cpp | 4 +-
src/CbcGeneral.cpp | 2 +-
src/CbcGeneral.hpp | 2 +-
src/CbcGeneralDepth.cpp | 2 +-
src/CbcGeneralDepth.hpp | 2 +-
src/CbcGeneric.cpp | 4 +-
src/CbcHeuristic.cpp | 234 +-
src/CbcHeuristic.hpp | 14 +-
src/CbcHeuristicDINS.cpp | 24 +-
src/CbcHeuristicDINS.hpp | 2 +-
src/CbcHeuristicDW.cpp | 2227 ++++++++++++++++
src/CbcHeuristicDW.hpp | 309 +++
src/CbcHeuristicDive.cpp | 313 ++-
src/CbcHeuristicDive.hpp | 22 +-
src/CbcHeuristicDiveCoefficient.cpp | 17 +-
src/CbcHeuristicDiveCoefficient.hpp | 2 +-
src/CbcHeuristicDiveFractional.cpp | 15 +-
src/CbcHeuristicDiveFractional.hpp | 2 +-
src/CbcHeuristicDiveGuided.cpp | 15 +-
src/CbcHeuristicDiveGuided.hpp | 2 +-
src/CbcHeuristicDiveLineSearch.cpp | 15 +-
src/CbcHeuristicDiveLineSearch.hpp | 2 +-
src/CbcHeuristicDivePseudoCost.cpp | 21 +-
src/CbcHeuristicDivePseudoCost.hpp | 2 +-
src/CbcHeuristicDiveVectorLength.cpp | 29 +-
src/CbcHeuristicDiveVectorLength.hpp | 2 +-
src/CbcHeuristicFPump.cpp | 236 +-
src/CbcHeuristicGreedy.cpp | 51 +-
src/CbcHeuristicLocal.cpp | 57 +-
src/CbcHeuristicLocal.hpp | 12 +-
src/CbcHeuristicPivotAndFix.cpp | 6 +-
src/CbcHeuristicPivotAndFix.hpp | 2 +-
src/CbcHeuristicRENS.cpp | 68 +-
src/CbcHeuristicRENS.hpp | 5 +-
src/CbcHeuristicRINS.cpp | 23 +-
src/CbcHeuristicRINS.hpp | 6 +-
src/CbcHeuristicRandRound.cpp | 8 +-
src/CbcHeuristicRandRound.hpp | 2 +-
src/CbcHeuristicVND.cpp | 8 +-
src/CbcHeuristicVND.hpp | 2 +-
src/CbcLinked.cpp | 2 +-
src/CbcLinked.hpp | 2 +-
src/CbcLinkedUtils.cpp | 2 +-
src/CbcMessage.cpp | 8 +-
src/CbcMipStartIO.cpp | 409 ++-
src/CbcModel.cpp | 1814 ++++++++++---
src/CbcModel.hpp | 106 +-
src/CbcNWay.cpp | 2 +-
src/CbcNWay.hpp | 2 +-
src/CbcNode.cpp | 2317 ++++++++++++++---
src/CbcNode.hpp | 8 +-
src/CbcNodeInfo.cpp | 26 +-
src/CbcNodeInfo.hpp | 12 +-
src/CbcObject.cpp | 2 +-
src/CbcObject.hpp | 2 +-
src/CbcObjectUpdateData.cpp | 2 +-
src/CbcObjectUpdateData.hpp | 2 +-
src/CbcPartialNodeInfo.cpp | 4 +-
src/CbcPartialNodeInfo.hpp | 2 +-
src/CbcSOS.cpp | 112 +-
src/CbcSOS.hpp | 4 +-
src/CbcSimpleInteger.cpp | 22 +-
src/CbcSimpleInteger.hpp | 4 +-
src/CbcSimpleIntegerDynamicPseudoCost.cpp | 455 +++-
src/CbcSimpleIntegerDynamicPseudoCost.hpp | 103 +-
src/CbcSimpleIntegerPseudoCost.cpp | 2 +-
src/CbcSimpleIntegerPseudoCost.hpp | 2 +-
src/CbcSolver.cpp | 2669 ++++++++++++++++----
src/CbcSolver.hpp | 20 +-
src/CbcSolverAnalyze.cpp | 3 +-
src/CbcSolverAnalyze.hpp | 2 +-
src/CbcSolverExpandKnapsack.cpp | 2 +-
src/CbcSolverExpandKnapsack.hpp | 2 +-
src/CbcSolverHeuristics.cpp | 112 +-
src/CbcSolverHeuristics.hpp | 2 +-
src/CbcSubProblem.cpp | 2 +-
src/CbcSubProblem.hpp | 2 +-
src/CbcSymmetry.cpp | 1427 +++++++++++
src/CbcSymmetry.hpp | 366 +++
src/CbcThread.cpp | 88 +-
src/CbcThread.hpp | 2 +-
src/CbcTree.cpp | 51 +-
src/CbcTree.hpp | 22 +-
src/Cbc_C_Interface.cpp | 2 +-
src/Cbc_C_Interface.h | 5 +-
src/Cbc_ampl.cpp | 2 +-
src/ClpAmplObjective.hpp | 2 +-
src/ClpConstraintAmpl.hpp | 2 +-
src/Makefile.am | 10 +-
src/Makefile.in | 37 +-
src/OsiCbc/Makefile.am | 2 +-
src/OsiCbc/Makefile.in | 9 +
src/OsiCbc/OsiCbcSolverInterface.cpp | 25 +-
src/OsiCbc/OsiCbcSolverInterface.hpp | 2 +-
src/config.h.in | 3 +
src/config_cbc_default.h | 6 +-
src/unitTestClp.cpp | 21 +-
test/CInterfaceTest.c | 5 +
test/Makefile.am | 2 +-
test/Makefile.in | 9 +
230 files changed, 14080 insertions(+), 10063 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coinor-cbc.git
More information about the debian-science-commits
mailing list