Changeset 1675 for stable

Timestamp:

Jun 19, 2011 1:23:14 PM (9 years ago)

Author:

stefan

Message:

sync with trunk rev1674

Location:

stable/2.7

Files:

• . (modified) (view diffs)
• Cbc (modified) (view diffs)
• Cbc/MSVisualStudio/v10 (copied) (copied from trunk/Cbc/MSVisualStudio/v10) (view diffs)
• Cbc/MSVisualStudio/v10/Cbc.sln (copied) (copied from trunk/Cbc/MSVisualStudio/v10/Cbc.sln) (view diffs)
• Cbc/MSVisualStudio/v10/CbcCSosDllSample (copied) (copied from trunk/Cbc/MSVisualStudio/v10/CbcCSosDllSample) (view diffs)
• Cbc/MSVisualStudio/v10/CbcCSosDllSample/cbcCSosDllSample.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/CbcCSosDllSample/cbcCSosDllSample.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10/OsiCbcUnitTest (copied) (copied from trunk/Cbc/MSVisualStudio/v10/OsiCbcUnitTest) (view diffs)
• Cbc/MSVisualStudio/v10/OsiCbcUnitTest/OsiCbcUnitTest.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/OsiCbcUnitTest/OsiCbcUnitTest.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10/cbc (copied) (copied from trunk/Cbc/MSVisualStudio/v10/cbc) (view diffs)
• Cbc/MSVisualStudio/v10/cbc/cbc.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/cbc/cbc.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10/cbcCInterfaceDll (copied) (copied from trunk/Cbc/MSVisualStudio/v10/cbcCInterfaceDll) (view diffs)
• Cbc/MSVisualStudio/v10/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10/cbcExamplesSample2 (copied) (copied from trunk/Cbc/MSVisualStudio/v10/cbcExamplesSample2) (view diffs)
• Cbc/MSVisualStudio/v10/cbcExamplesSample2/cbcExamplesSample2.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/cbcExamplesSample2/cbcExamplesSample2.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10/libCbc (copied) (copied from trunk/Cbc/MSVisualStudio/v10/libCbc) (view diffs)
• Cbc/MSVisualStudio/v10/libCbc/libCbc.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/libCbc/libCbc.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10/libCbcSolver (copied) (copied from trunk/Cbc/MSVisualStudio/v10/libCbcSolver) (view diffs)
• Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10/libOsiCbc (copied) (copied from trunk/Cbc/MSVisualStudio/v10/libOsiCbc) (view diffs)
• Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10alt (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt) (view diffs)
• Cbc/MSVisualStudio/v10alt/Cbc.sln (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/Cbc.sln) (view diffs)
• Cbc/MSVisualStudio/v10alt/Cbc.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/Cbc.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10alt/OsiCbcUnitTest.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/OsiCbcUnitTest.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10alt/cbc.props (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/cbc.props) (view diffs)
• Cbc/MSVisualStudio/v10alt/cbcsolver.props (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/cbcsolver.props) (view diffs)
• Cbc/MSVisualStudio/v10alt/genDefForCbc.ps1 (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/genDefForCbc.ps1) (view diffs)
• Cbc/MSVisualStudio/v10alt/libCbc.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/libCbc.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10alt/libCbcSolver.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/libCbcSolver.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10alt/libOsiCbc.vcxproj (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/libOsiCbc.vcxproj) (view diffs)
• Cbc/MSVisualStudio/v10alt/osicbc.props (copied) (copied from trunk/Cbc/MSVisualStudio/v10alt/osicbc.props) (view diffs)
• Cbc/MSVisualStudio/v9/OsiCbcUnitTest/OsiCbcUnitTest.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9/cbc/cbc.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9/cbcCInterfaceDll/cbcCInterfaceDll.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9/cbcCSosDllSample/cbcCSosDllSample.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9/cbcExamplesSample2/cbcExamplesSample2.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9/libCbc/libCbc.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9alt/Cbc.sln (modified) (view diffs)
• Cbc/MSVisualStudio/v9alt/Cbc.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9alt/OsiCbcUnitTest.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9alt/genDefForCbc.ps1 (copied) (copied from trunk/Cbc/MSVisualStudio/v9alt/genDefForCbc.ps1) (view diffs)
• Cbc/MSVisualStudio/v9alt/libCbc.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9alt/libCbcSolver.vcproj (modified) (view diffs)
• Cbc/MSVisualStudio/v9alt/libOsiCbc.vcproj (modified) (view diffs)
• Cbc/Makefile.am (modified) (view diffs)
• Cbc/Makefile.in (modified) (view diffs)
• Cbc/cbc-uninstalled.pc.in (modified) (view diffs)
• Cbc/configure (modified) (view diffs)
• Cbc/configure.ac (modified) (view diffs)
• Cbc/examples/Makefile.in (modified) (view diffs)
• Cbc/examples/driver4.cpp (modified) (view diffs)
• Cbc/examples/sample1.cpp (modified) (view diffs)
• Cbc/examples/sample2.cpp (modified) (view diffs)
• Cbc/examples/sample3.cpp (modified) (view diffs)
• Cbc/examples/sample4.cpp (modified) (view diffs)
• Cbc/examples/sample5.cpp (modified) (view diffs)
• Cbc/inc (deleted)
• Cbc/src/CbcBranchDefaultDecision.cpp (modified) (view diffs)
• Cbc/src/CbcBranchingObject.hpp (modified) (view diffs)
• Cbc/src/CbcChooseVariable.hpp (deleted)
• Cbc/src/CbcClique.hpp (modified) (view diffs)
• Cbc/src/CbcConfig.h (modified) (view diffs)
• Cbc/src/CbcCountRowCut.cpp (modified) (view diffs)
• Cbc/src/CbcCutGenerator.cpp (modified) (view diffs)
• Cbc/src/CbcCutGenerator.hpp (modified) (view diffs)
• Cbc/src/CbcCutSubsetModifier.cpp (modified) (view diffs)
• Cbc/src/CbcEventHandler.hpp (modified) (view diffs)
• Cbc/src/CbcFathomDynamicProgramming.cpp (modified) (view diffs)
• Cbc/src/CbcFullNodeInfo.cpp (modified) (view diffs)
• Cbc/src/CbcGenMessages.hpp (modified) (view diffs)
• Cbc/src/CbcHeuristic.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristic.hpp (modified) (view diffs)
• Cbc/src/CbcHeuristicDive.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicDiveCoefficient.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicDiveFractional.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicDiveGuided.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicDiveLineSearch.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicDiveVectorLength.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicGreedy.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicGreedy.hpp (modified) (view diffs)
• Cbc/src/CbcHeuristicLocal.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicPivotAndFix.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicRENS.cpp (modified) (view diffs)
• Cbc/src/CbcHeuristicRINS.cpp (modified) (view diffs)
• Cbc/src/CbcMessage.cpp (modified) (view diffs)
• Cbc/src/CbcMessage.hpp (modified) (view diffs)
• Cbc/src/CbcModel.cpp (modified) (view diffs)
• Cbc/src/CbcModel.hpp (modified) (view diffs)
• Cbc/src/CbcNode.cpp (modified) (view diffs)
• Cbc/src/CbcObject.hpp (modified) (view diffs)
• Cbc/src/CbcPartialNodeInfo.cpp (modified) (view diffs)
• Cbc/src/CbcSOS.cpp (modified) (view diffs)
• Cbc/src/CbcSimpleInteger.cpp (modified) (view diffs)
• Cbc/src/CbcSimpleInteger.hpp (modified) (view diffs)
• Cbc/src/CbcSimpleIntegerDynamicPseudoCost.cpp (modified) (view diffs)
• Cbc/src/CbcSolver.cpp (modified) (view diffs)
• Cbc/src/CbcSolver.hpp (modified) (view diffs)
• Cbc/src/CbcSolverHeuristics.cpp (modified) (view diffs)
• Cbc/src/CbcSolverHeuristics.hpp (modified) (view diffs)
• Cbc/src/CbcStrategy.cpp (modified) (view diffs)
• Cbc/src/CbcSubProblem.cpp (modified) (view diffs)
• Cbc/src/CbcTree.hpp (modified) (view diffs)
• Cbc/src/CbcTreeLocal.cpp (modified) (view diffs)
• Cbc/src/Cbc_C_Interface.h (modified) (view diffs)
• Cbc/src/Cbc_ampl.cpp (modified) (view diffs)
• Cbc/src/CoinSolve.cpp (modified) (view diffs)
• Cbc/src/Makefile.am (modified) (view diffs)
• Cbc/src/Makefile.in (modified) (view diffs)
• Cbc/src/OsiCbc/Makefile.am (modified) (view diffs)
• Cbc/src/OsiCbc/Makefile.in (modified) (view diffs)
• Cbc/src/OsiCbc/OsiCbcSolverInterface.hpp (modified) (view diffs)
• Cbc/src/config.h.in (copied) (copied from trunk/Cbc/src/config.h.in) (view diffs)
• Cbc/src/config_cbc.h.in (added)
• Cbc/src/config_cbc_default.h (added)
• Cbc/src/config_default.h (added)
• Cbc/src/unitTest.cpp (modified) (view diffs)
• Cbc/src/unitTestClp.cpp (modified) (view diffs)
• Cbc/test/Makefile.am (modified) (view diffs)
• Cbc/test/Makefile.in (modified) (view diffs)
• Cbc/test/OsiCbcSolverInterfaceTest.cpp (modified) (view diffs)
• Cbc/test/osiUnitTest.cpp (modified) (view diffs)
• Dependencies (modified) (view diffs)
• Makefile.in (modified) (view diffs)
• configure (modified) (view diffs)
• configure.ac (modified) (view diffs)

stable/2.7

@@ -1 @@
-BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
-ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
-ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
-ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
-ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
-Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
-CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
-Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
-Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
-Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
+BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
+ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
+ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
+ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
+ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
+ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
+Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
+Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
+Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi

@@ -1 @@
-BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
-ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
-ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
-ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
-ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
-Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
-CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
-Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
-Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
-Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
+BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
+ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
+ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
+ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
+ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
+ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
+Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
+Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
+Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi

@@ -1 @@
-BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
-ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
-ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
-ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
-ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
-Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
-CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
-Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
-Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
-Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
+BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
+ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
+ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
+ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
+ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
+ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
+Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
+Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
+Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi