Changeset 1902

Timestamp:

Apr 10, 2013 12:58:16 PM (7 years ago)

Author:

stefan

Message:

sync with trunk rev 1901

Location:

stable/2.8/Cbc

Files:

• . (modified) (1 prop)
• INSTALL (modified) (1 prop)
• LICENSE (modified) (1 prop)
• MSVisualStudio/v10/CbcCSosDllSample/cbcCSosDllSample.vcxproj (modified) (6 diffs)
• MSVisualStudio/v10/OsiCbcUnitTest/OsiCbcUnitTest.vcxproj (modified) (6 diffs)
• MSVisualStudio/v10/cbc/cbc.vcxproj (modified) (4 diffs)
• MSVisualStudio/v10/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj (modified) (2 diffs)
• MSVisualStudio/v10/cbcExamplesSample2/cbcExamplesSample2.vcxproj (modified) (13 diffs)
• MSVisualStudio/v10/libCbc/libCbc.vcxproj (modified) (3 diffs)
• MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj (modified) (5 diffs)
• MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj (modified) (2 diffs)
• MSVisualStudio/v9/Cbc.sln (modified) (3 diffs)
• MSVisualStudio/v9/cbc/cbc.vcproj (modified) (5 diffs)
• MSVisualStudio/v9/cbcExamplesSample2/cbcExamplesSample2.vcproj (modified) (21 diffs)
• MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj (modified) (7 diffs)
• README (modified) (2 diffs)
• configure (modified) (1 prop)
• configure.ac (modified) (1 prop)
• examples/CbcBranchFollow2.cpp (modified) (2 diffs)
• examples/CbcBranchLink.cpp (modified) (5 diffs)
• examples/CbcBranchLink.hpp (modified) (1 diff)
• examples/CbcBranchUser.cpp (modified) (1 diff)
• examples/CbcCompareUser.cpp (modified) (2 diffs)
• examples/CbcSolver3.cpp (modified) (2 diffs)
• examples/CbcSolverLongThin.cpp (modified) (2 diffs)
• examples/Makefile.in (modified) (5 diffs)
• examples/allCuts.cpp (modified) (3 diffs)
• examples/barrier.cpp (modified) (2 diffs)
• examples/cbc_driverC_sos.c (modified) (3 diffs)
• examples/crew.cpp (modified) (4 diffs)
• examples/driver.cpp (modified) (4 diffs)
• examples/driver2.cpp (modified) (3 diffs)
• examples/driver3.cpp (modified) (2 diffs)
• examples/driver4.cpp (modified) (2 diffs)
• examples/fast0507.cpp (modified) (3 diffs)
• examples/fast0507b.cpp (modified) (4 diffs)
• examples/gear.cpp (modified) (2 diffs)
• examples/hotstart.cpp (modified) (3 diffs)
• examples/interrupt.cpp (modified) (2 diffs, 1 prop)
• examples/link.cpp (modified) (2 diffs)
• examples/longthin.cpp (modified) (3 diffs)
• examples/lotsize.cpp (modified) (2 diffs)
• examples/minimum.cpp (modified) (1 diff)
• examples/nway.cpp (modified) (2 diffs)
• examples/qmip.cpp (modified) (2 diffs)
• examples/qmip2.cpp (modified) (1 diff)
• examples/repeat.cpp (modified) (4 diffs)
• examples/sample1.cpp (modified) (2 diffs)
• examples/sample2.cpp (modified) (2 diffs)
• examples/sample3.cpp (modified) (1 diff)
• examples/sample4.cpp (modified) (9 diffs)
• examples/sample5.cpp (modified) (1 diff)
• examples/simpleBAB.cpp (modified) (6 diffs)
• examples/sos.cpp (modified) (2 diffs)
• examples/sudoku.cpp (modified) (2 diffs)
• src/CbcBranchAllDifferent.cpp (modified) (1 prop)
• src/CbcBranchAllDifferent.hpp (modified) (1 prop)
• src/CbcBranchDecision.cpp (modified) (1 prop)
• src/CbcBranchDecision.hpp (modified) (1 prop)
• src/CbcBranchDefaultDecision.cpp (modified) (1 prop)
• src/CbcBranchDefaultDecision.hpp (modified) (1 prop)
• src/CbcBranchToFixLots.cpp (modified) (1 prop)
• src/CbcBranchToFixLots.hpp (modified) (1 prop)
• src/CbcBranchingObject.cpp (modified) (1 prop)
• src/CbcBranchingObject.hpp (modified) (1 prop)
• src/CbcCbcParam.cpp (modified) (1 prop)
• src/CbcClique.cpp (modified) (1 prop)
• src/CbcClique.hpp (modified) (1 prop)
• src/CbcCompare.hpp (modified) (1 prop)
• src/CbcCompareDefault.cpp (modified) (1 prop)
• src/CbcCompareDefault.hpp (modified) (1 prop)
• src/CbcCompareDepth.cpp (modified) (1 prop)
• src/CbcCompareDepth.hpp (modified) (1 prop)
• src/CbcCompareEstimate.cpp (modified) (1 prop)
• src/CbcCompareEstimate.hpp (modified) (1 prop)
• src/CbcCompareObjective.cpp (modified) (1 prop)
• src/CbcCompareObjective.hpp (modified) (1 prop)
• src/CbcConsequence.cpp (modified) (1 prop)
• src/CbcConsequence.hpp (modified) (1 prop)
• src/CbcCutModifier.cpp (modified) (1 prop)
• src/CbcCutModifier.hpp (modified) (1 prop)
• src/CbcCutSubsetModifier.cpp (modified) (1 prop)
• src/CbcCutSubsetModifier.hpp (modified) (1 prop)
• src/CbcDummyBranchingObject.cpp (modified) (1 prop)
• src/CbcDummyBranchingObject.hpp (modified) (1 prop)
• src/CbcFathom.hpp (modified) (2 diffs)
• src/CbcFixVariable.cpp (modified) (1 prop)
• src/CbcFixVariable.hpp (modified) (1 prop)
• src/CbcFollowOn.cpp (modified) (1 prop)
• src/CbcFollowOn.hpp (modified) (1 prop)
• src/CbcFullNodeInfo.cpp (modified) (1 prop)
• src/CbcFullNodeInfo.hpp (modified) (1 prop)
• src/CbcGenBaB.cpp (modified) (1 prop)
• src/CbcGenCbcParam.cpp (modified) (1 prop)
• src/CbcGenCbcParam.hpp (modified) (1 prop)
• src/CbcGenCbcParamUtils.cpp (modified) (1 prop)
• src/CbcGenCtlBlk.cpp (modified) (1 prop)
• src/CbcGenCtlBlk.hpp (modified) (1 prop)
• src/CbcGenMessages.cpp (modified) (1 prop)
• src/CbcGenMessages.hpp (modified) (1 prop)
• src/CbcGenOsiParam.cpp (modified) (1 prop)
• src/CbcGenOsiParam.hpp (modified) (1 prop)
• src/CbcGenOsiParamUtils.cpp (modified) (1 prop)
• src/CbcGenParam.cpp (modified) (1 prop)
• src/CbcGenParam.hpp (modified) (1 prop)
• src/CbcGenParamUtils.cpp (modified) (1 prop)
• src/CbcGenSolution.cpp (modified) (1 prop)
• src/CbcGenSolvers.cpp (modified) (1 prop)
• src/CbcGeneral.cpp (modified) (1 prop)
• src/CbcGeneral.hpp (modified) (1 prop)
• src/CbcGeneralDepth.cpp (modified) (1 prop)
• src/CbcGeneralDepth.hpp (modified) (1 prop)
• src/CbcGeneric.cpp (modified) (1 prop)
• src/CbcHeuristicDINS.cpp (modified) (1 prop)
• src/CbcHeuristicDINS.hpp (modified) (1 prop)
• src/CbcHeuristicDive.cpp (modified) (1 prop)
• src/CbcHeuristicDive.hpp (modified) (1 prop)
• src/CbcHeuristicDiveCoefficient.cpp (modified) (1 prop)
• src/CbcHeuristicDiveCoefficient.hpp (modified) (1 prop)
• src/CbcHeuristicDiveFractional.cpp (modified) (1 prop)
• src/CbcHeuristicDiveFractional.hpp (modified) (1 prop)
• src/CbcHeuristicDiveGuided.cpp (modified) (1 prop)
• src/CbcHeuristicDiveGuided.hpp (modified) (1 prop)
• src/CbcHeuristicDiveLineSearch.cpp (modified) (1 prop)
• src/CbcHeuristicDiveLineSearch.hpp (modified) (1 prop)
• src/CbcHeuristicDivePseudoCost.cpp (modified) (1 prop)
• src/CbcHeuristicDivePseudoCost.hpp (modified) (1 prop)
• src/CbcHeuristicDiveVectorLength.cpp (modified) (1 prop)
• src/CbcHeuristicDiveVectorLength.hpp (modified) (1 prop)
• src/CbcHeuristicPivotAndFix.cpp (modified) (1 prop)
• src/CbcHeuristicPivotAndFix.hpp (modified) (1 prop)
• src/CbcHeuristicRENS.cpp (modified) (1 prop)
• src/CbcHeuristicRENS.hpp (modified) (1 prop)
• src/CbcHeuristicRINS.cpp (modified) (1 prop)
• src/CbcHeuristicRINS.hpp (modified) (1 prop)
• src/CbcHeuristicRandRound.cpp (modified) (1 prop)
• src/CbcHeuristicRandRound.hpp (modified) (1 prop)
• src/CbcHeuristicVND.cpp (modified) (1 prop)
• src/CbcHeuristicVND.hpp (modified) (1 prop)
• src/CbcLinked.cpp (modified) (1 prop)
• src/CbcLinked.hpp (modified) (1 prop)
• src/CbcLinkedUtils.cpp (modified) (1 prop)
• src/CbcMipStartIO.cpp (modified) (1 prop)
• src/CbcMipStartIO.hpp (modified) (1 prop)
• src/CbcModel.cpp (modified) (2 diffs)
• src/CbcModel.hpp (modified) (4 diffs)
• src/CbcNWay.cpp (modified) (1 prop)
• src/CbcNWay.hpp (modified) (1 prop)
• src/CbcNodeInfo.cpp (modified) (1 prop)
• src/CbcNodeInfo.hpp (modified) (1 prop)
• src/CbcObject.cpp (modified) (1 prop)
• src/CbcObject.hpp (modified) (1 prop)
• src/CbcObjectUpdateData.cpp (modified) (1 prop)
• src/CbcObjectUpdateData.hpp (modified) (1 prop)
• src/CbcPartialNodeInfo.cpp (modified) (1 prop)
• src/CbcPartialNodeInfo.hpp (modified) (1 prop)
• src/CbcSOS.cpp (modified) (1 diff, 1 prop)
• src/CbcSOS.hpp (modified) (1 prop)
• src/CbcSimpleInteger.cpp (modified) (1 prop)
• src/CbcSimpleInteger.hpp (modified) (1 prop)
• src/CbcSimpleIntegerDynamicPseudoCost.cpp (modified) (1 prop)
• src/CbcSimpleIntegerDynamicPseudoCost.hpp (modified) (1 prop)
• src/CbcSimpleIntegerPseudoCost.cpp (modified) (1 prop)
• src/CbcSimpleIntegerPseudoCost.hpp (modified) (1 prop)
• src/CbcSolver.cpp (modified) (1 prop)
• src/CbcSolver.hpp (modified) (1 prop)
• src/CbcSolverAnalyze.cpp (modified) (1 prop)
• src/CbcSolverAnalyze.hpp (modified) (1 prop)
• src/CbcSolverExpandKnapsack.cpp (modified) (1 prop)
• src/CbcSolverExpandKnapsack.hpp (modified) (1 prop)
• src/CbcSolverHeuristics.cpp (modified) (1 prop)
• src/CbcSolverHeuristics.hpp (modified) (1 prop)
• src/CbcSubProblem.cpp (modified) (1 prop)
• src/CbcSubProblem.hpp (modified) (1 prop)
• src/CbcThread.cpp (modified) (1 diff, 1 prop)
• src/CbcThread.hpp (modified) (1 prop)
• src/Cbc_C_Interface.cpp (modified) (1 diff)
• src/Cbc_C_Interface.h (modified) (1 diff)
• src/ClpAmplObjective.hpp (modified) (1 prop)
• src/ClpConstraintAmpl.hpp (modified) (1 prop)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (2 diffs, 1 prop)
• src/OsiCbc/Makefile.am (modified) (1 prop)
• src/OsiCbc/Makefile.in (modified) (2 props)
• src/OsiCbc/OsiCbcSolverInterface.cpp (modified) (1 prop)
• src/OsiCbc/OsiCbcSolverInterface.hpp (modified) (1 prop)
• src/config.h.in (modified) (1 prop)
• src/config_cbc.h.in (modified) (1 prop)
• src/config_cbc_default.h (modified) (1 prop)
• src/config_default.h (modified) (1 prop)

stable/2.8/Cbc/MSVisualStudio/v10/CbcCSosDllSample/cbcCSosDllSample.vcxproj

@@ -27 +27 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -46 +42 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -86 +82 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;CBCCINTERFACEDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <CallingConvention>Cdecl</CallingConvention>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>true</MapExports>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;CBCCINTERFACEDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <CallingConvention>Cdecl</CallingConvention>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>true</MapExports>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;CBCCINTERFACEDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94 +150 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapExports>true</MapExports>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;CBCCINTERFACEDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapExports>true</MapExports>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;CBCCINTERFACEDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
@@ -188 +176 @@
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cbc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;CBCCINTERFACEDLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample\\\\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -194 +181 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>Cdecl</CallingConvention>
       <CompileAs>Default</CompileAs>

stable/2.8/Cbc/MSVisualStudio/v10/OsiCbcUnitTest/OsiCbcUnitTest.vcxproj

@@ -27 +27 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -48 +42 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -88 +82 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";NETLIBDIR="..\\..\\..\\..\\Data\\Netlib";MIPLIBDIR="..\\..\\..\\..\\Data\\miplib3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
     </ClCompile>
     <Link>
@@ -112 +100 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";NETLIBDIR="..\\..\\..\\..\\Data\\Netlib";MIPLIBDIR="..\\..\\..\\..\\Data\\miplib3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
     </ClCompile>
     <Link>
@@ -141 +123 @@
     </Midl>
     <ClCompile>
-      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";NETLIBDIR="..\\..\\..\\..\\Data\\Netlib";MIPLIBDIR="..\\..\\..\\..\\Data\\miplib3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
     </ClCompile>
     <Link>
@@ -168 +144 @@
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";NETLIBDIR="..\\..\\..\\..\\Data\\Netlib";MIPLIBDIR="..\\..\\..\\..\\Data\\miplib3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
     </ClCompile>
     <Link>

stable/2.8/Cbc/MSVisualStudio/v10/cbc/cbc.vcxproj

@@ -26 +26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v90</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -37 +35 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -97 +94 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
@@ -165 +158 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>

stable/2.8/Cbc/MSVisualStudio/v10/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj

@@ -27 +27 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -47 +43 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

stable/2.8/Cbc/MSVisualStudio/v10/cbcExamplesSample2/cbcExamplesSample2.vcxproj

@@ -26 +26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -50 +42 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
+    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -98 +90 @@
     </Midl>
     <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
@@ -120 +100 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -144 +124 @@
     </Midl>
     <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Debug/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
@@ -166 +134 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -189 +157 @@
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
@@ -212 +167 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -235 +190 @@
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Release/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
-      <ObjectFileName>.\Release/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>Default</CompileAs>
     </ClCompile>
     <ResourceCompile>
@@ -258 +200 @@
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -298 +240 @@
       <ProgramDataBaseFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)vc90.pdb</ProgramDataBaseFileName>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\CbcCbcParam.cpp" />
     <ClCompile Include="..\..\..\examples\CbcCompareUser.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@@ -323 +264 @@
       <ProgramDataBaseFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)vc90.pdb</ProgramDataBaseFileName>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\CbcLinked.cpp" />
-    <ClCompile Include="..\..\..\src\CbcLinkedUtils.cpp" />
-    <ClCompile Include="..\..\..\src\CbcSolver.cpp" />
-    <ClCompile Include="..\..\..\src\CbcSolverAnalyze.cpp" />
-    <ClCompile Include="..\..\..\src\CbcSolverExpandKnapsack.cpp" />
-    <ClCompile Include="..\..\..\src\CbcSolverHeuristics.cpp" />
     <ClCompile Include="..\..\..\examples\sample2.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@@ -353 +288 @@
       <ProgramDataBaseFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)vc90.pdb</ProgramDataBaseFileName>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\unitTestClp.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\CbcBranchBase.hpp" />
     <ClInclude Include="..\..\..\examples\CbcBranchUser.hpp" />
-    <ClInclude Include="..\..\..\src\CbcCompareBase.hpp" />
     <ClInclude Include="..\..\..\examples\CbcCompareUser.hpp" />
-    <ClInclude Include="..\..\..\src\CbcCutGenerator.hpp" />
-    <ClInclude Include="..\..\..\src\CbcHeuristic.hpp" />
-    <ClInclude Include="..\..\..\src\CbcHeuristicLocal.hpp" />
-    <ClInclude Include="..\..\..\src\CbcMessage.hpp" />
-    <ClInclude Include="..\..\..\src\CbcModel.hpp" />
-    <ClInclude Include="..\..\..\src\CbcNode.hpp" />
-    <ClInclude Include="..\..\..\src\CbcStrategy.hpp" />
-    <ClInclude Include="..\..\..\src\CbcTree.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglClique\CglClique.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglCutGenerator.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglFlowCover\CglFlowCover.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglGomory\CglGomory.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglKnapsackCover\CglKnapsackCover.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglMixedIntegerRounding2\CglMixedIntegerRounding2.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglPreProcess\CglPreProcess.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglProbing\CglProbing.hpp" />
-    <ClInclude Include="..\..\..\..\Cgl\src\CglRedSplit\CglRedSplit.hpp" />
-    <ClInclude Include="..\..\..\..\Clp\src\ClpConfig.h" />
-    <ClInclude Include="..\..\..\..\Clp\src\ClpMatrixBase.hpp" />
-    <ClInclude Include="..\..\..\..\Clp\src\ClpModel.hpp" />
-    <ClInclude Include="..\..\..\..\Clp\src\ClpObjective.hpp" />
-    <ClInclude Include="..\..\..\..\Clp\src\ClpParameters.hpp" />
-    <ClInclude Include="..\..\..\..\Clp\src\ClpSimplex.hpp" />
-    <ClInclude Include="..\..\..\..\Clp\src\ClpSolve.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinDistance.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinError.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinFinite.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinFloatEqual.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinHelperFunctions.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinIndexedVector.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinMessage.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinMessageHandler.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPackedMatrix.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPackedVector.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPackedVectorBase.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPragma.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPresolveMatrix.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinShallowPackedVector.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinSort.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinTime.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinWarmStart.hpp" />
-    <ClInclude Include="..\..\..\..\CoinUtils\src\CoinWarmStartBasis.hpp" />
     <ClInclude Include="..\..\..\..\BuildTools\headers\configall_system.h" />
     <ClInclude Include="..\..\..\..\BuildTools\headers\configall_system_msc.h" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiClp\OsiClpSolverInterface.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiColCut.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiCollections.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiCut.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiCuts.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiPresolve.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiRowCut.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiSolverInterface.hpp" />
-    <ClInclude Include="..\..\..\..\Osi\src\OsiSolverParameters.hpp" />
   </ItemGroup>
   <ItemGroup>

stable/2.8/Cbc/MSVisualStudio/v10/libCbc/libCbc.vcxproj

@@ -26 +26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v90</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -37 +35 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -86 +83 @@
       <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <ShowIncludes>false</ShowIncludes>
     </ClCompile>
     <ResourceCompile>

stable/2.8/Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj

@@ -27 +27 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v90</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -38 +36 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -81 +78 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglRedSplit2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
@@ -104 +99 @@
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
@@ -117 +112 @@
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglResidualCapacity;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>

stable/2.8/Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj

@@ -30 +30 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v90</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -83 +82 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>

stable/2.8/Cbc/MSVisualStudio/v9/Cbc.sln

@@ -1 +1 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cbcExamplesSample2", "cbcExamplesSample2\cbcExamplesSample2.vcproj", "{4C0B8243-2876-4C92-B6CB-2472B0571CC3}"
         ProjectSection(ProjectDependencies) = postProject
@@ -78 +78 @@
                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|Win32.ActiveCfg = Debug|Win32
                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|Win32.Build.0 = Debug|Win32
-                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|x64.ActiveCfg = Debug|x64
-                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|x64.Build.0 = Debug|x64
+                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|x64.ActiveCfg = Debug|Win32
                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|Win32.ActiveCfg = Release|Win32
                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|Win32.Build.0 = Release|Win32
-                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|x64.ActiveCfg = Release|x64
-                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|x64.Build.0 = Release|x64
+                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|x64.ActiveCfg = Release|Win32
                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|Win32.ActiveCfg = Debug|Win32
                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|Win32.Build.0 = Debug|Win32
-                {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|x64.ActiveCfg = Debug|x64
-                {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|x64.Build.0 = Debug|x64
+                {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|x64.ActiveCfg = Debug|Win32
                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|Win32.ActiveCfg = Release|Win32
                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|Win32.Build.0 = Release|Win32
-                {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|x64.ActiveCfg = Release|x64
-                {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|x64.Build.0 = Release|x64
+                {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|x64.ActiveCfg = Release|Win32
                 {363BA154-FEC9-4E1E-BC23-93CEC58AB785}.Debug|Win32.ActiveCfg = Debug|Win32
                 {363BA154-FEC9-4E1E-BC23-93CEC58AB785}.Debug|Win32.Build.0 = Debug|Win32
@@ -144 +140 @@
                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|Win32.ActiveCfg = Debug|Win32
                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|Win32.Build.0 = Debug|Win32
-                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|x64.ActiveCfg = Debug|x64
-                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|x64.Build.0 = Debug|x64
+                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|x64.ActiveCfg = Debug|Win32
                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|Win32.ActiveCfg = Release|Win32
                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|Win32.Build.0 = Release|Win32
-                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|x64.ActiveCfg = Release|x64
-                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|x64.Build.0 = Release|x64
+                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|x64.ActiveCfg = Release|Win32
                 {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|Win32.ActiveCfg = Debug|Win32
                 {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|Win32.Build.0 = Debug|Win32

stable/2.8/Cbc/MSVisualStudio/v9/cbc/cbc.vcproj

@@ -43 +43 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TypeLibraryName=".\Debug/cbcSolve.tlb"
+                                TypeLibraryName=".\Debug\cbcSolve.tlb"
                                 HeaderFileName=""
                         />
@@ -129 +129 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TypeLibraryName=".\Release/cbcSolve.tlb"
+                                TypeLibraryName=".\Release\cbcSolve.tlb"
                                 HeaderFileName=""
                         />
@@ -216 +216 @@
                                 Name="VCMIDLTool"
                                 TargetEnvironment="3"
-                                TypeLibraryName=".\Debug/cbcSolve.tlb"
+                                TypeLibraryName=".\Debug\cbcSolve.tlb"
                                 HeaderFileName=""
                         />
@@ -303 +303 @@
                                 Name="VCMIDLTool"
                                 TargetEnvironment="3"
-                                TypeLibraryName=".\Release/cbcSolve.tlb"
+                                TypeLibraryName=".\Release\cbcSolve.tlb"
                                 HeaderFileName=""
                         />
@@ -429 +429 @@
         </Globals>
 </VisualStudioProject>
+

stable/2.8/Cbc/MSVisualStudio/v9/cbcExamplesSample2/cbcExamplesSample2.vcproj

@@ -43 +43 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TypeLibraryName=".\Debug/cbcExamplesSample2.tlb"
+                                TypeLibraryName=".\Debug\cbcExamplesSample2.tlb"
                                 HeaderFileName=""
                         />
@@ -49 +49 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
+                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;"
                                 BasicRuntimeChecks="3"
@@ -55 +55 @@
                                 RuntimeTypeInfo="true"
                                 UsePrecompiledHeader="0"
-                                PrecompiledHeaderFile=".\Debug/cbcExamplesSample2.pch"
-                                AssemblerListingLocation=".\Debug/"
-                                ObjectFile=".\Debug/"
-                                ProgramDataBaseFileName=".\Debug/"
+                                PrecompiledHeaderFile=".\Debug\cbcExamplesSample2.pch"
+                                AssemblerListingLocation=".\Debug\"
+                                ObjectFile=".\Debug\"
+                                ProgramDataBaseFileName=".\Debug\"
                                 WarningLevel="3"
                                 SuppressStartupBanner="true"
@@ -83 +83 @@
                                 AdditionalLibraryDirectories="$(OutDir)"
                                 GenerateDebugInformation="true"
-                                ProgramDatabaseFile=".\Debug/cbcExamplesSample2.pdb"
+                                ProgramDatabaseFile=".\Debug\cbcExamplesSample2.pdb"
+                                SubSystem="1"
+                                RandomizedBaseAddress="1"
+                                DataExecutionPrevention="0"
+                                TargetMachine="1"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                                TypeLibraryName=".\Release\cbcExamplesSample2.tlb"
+                                HeaderFileName=""
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                Optimization="2"
+                                InlineFunctionExpansion="1"
+                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
+                                PreprocessorDefinitions="WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;"
+                                StringPooling="true"
+                                RuntimeLibrary="2"
+                                EnableFunctionLevelLinking="true"
+                                RuntimeTypeInfo="true"
+                                UsePrecompiledHeader="0"
+                                PrecompiledHeaderFile=".\Release\cbcExamplesSample2.pch"
+                                AssemblerListingLocation=".\Release\"
+                                ObjectFile=".\Release\"
+                                ProgramDataBaseFileName=".\Release\"
+                                WarningLevel="3"
+                                SuppressStartupBanner="true"
+                                CompileAs="0"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                                PreprocessorDefinitions="NDEBUG;_NDEBUG"
+                                Culture="1033"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="libOsiClp.lib"
+                                OutputFile="$(OutDir)\$(ProjectName).exe"
+                                LinkIncremental="1"
+                                SuppressStartupBanner="true"
+                                AdditionalLibraryDirectories="$(OutDir)"
+                                ProgramDatabaseFile=".\Release\cbcExamplesSample2.pdb"
                                 SubSystem="1"
                                 RandomizedBaseAddress="1"
@@ -136 +228 @@
                                 Name="VCMIDLTool"
                                 TargetEnvironment="3"
-                                TypeLibraryName=".\Debug/cbcExamplesSample2.tlb"
+                                TypeLibraryName=".\Debug\cbcExamplesSample2.tlb"
                                 HeaderFileName=""
                         />
@@ -142 +234 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
+                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;"
                                 BasicRuntimeChecks="3"
@@ -148 +240 @@
                                 RuntimeTypeInfo="true"
                                 UsePrecompiledHeader="0"
-                                PrecompiledHeaderFile=".\Debug/cbcExamplesSample2.pch"
-                                AssemblerListingLocation=".\Debug/"
-                                ObjectFile=".\Debug/"
-                                ProgramDataBaseFileName=".\Debug/"
+                                PrecompiledHeaderFile=".\Debug\cbcExamplesSample2.pch"
+                                AssemblerListingLocation=".\Debug\"
+                                ObjectFile=".\Debug\"
+                                ProgramDataBaseFileName=".\Debug\"
                                 WarningLevel="3"
                                 SuppressStartupBanner="true"
@@ -176 +268 @@
                                 AdditionalLibraryDirectories="$(OutDir)"
                                 GenerateDebugInformation="true"
-                                ProgramDatabaseFile=".\Debug/cbcExamplesSample2.pdb"
+                                ProgramDatabaseFile=".\Debug\cbcExamplesSample2.pdb"
                                 SubSystem="1"
                                 RandomizedBaseAddress="1"
                                 DataExecutionPrevention="0"
                                 TargetMachine="17"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                                TypeLibraryName=".\Release/cbcExamplesSample2.tlb"
-                                HeaderFileName=""
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                Optimization="2"
-                                InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
-                                PreprocessorDefinitions="WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;"
-                                StringPooling="true"
-                                RuntimeLibrary="2"
-                                EnableFunctionLevelLinking="true"
-                                RuntimeTypeInfo="true"
-                                UsePrecompiledHeader="0"
-                                PrecompiledHeaderFile=".\Release/cbcExamplesSample2.pch"
-                                AssemblerListingLocation=".\Release/"
-                                ObjectFile=".\Release/"
-                                ProgramDataBaseFileName=".\Release/"
-                                WarningLevel="3"
-                                SuppressStartupBanner="true"
-                                CompileAs="0"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                                PreprocessorDefinitions="NDEBUG;_NDEBUG"
-                                Culture="1033"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="libOsiClp.lib"
-                                OutputFile="$(OutDir)\$(ProjectName).exe"
-                                LinkIncremental="1"
-                                SuppressStartupBanner="true"
-                                AdditionalLibraryDirectories="$(OutDir)"
-                                ProgramDatabaseFile=".\Release/cbcExamplesSample2.pdb"
-                                SubSystem="1"
-                                RandomizedBaseAddress="1"
-                                DataExecutionPrevention="0"
-                                TargetMachine="1"
                         />
                         <Tool
@@ -321 +321 @@
                                 Name="VCMIDLTool"
                                 TargetEnvironment="3"
-                                TypeLibraryName=".\Release/cbcExamplesSample2.tlb"
+                                TypeLibraryName=".\Release\cbcExamplesSample2.tlb"
                                 HeaderFileName=""
                         />
@@ -328 +328 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
+                                AdditionalIncludeDirectories="..\..\..\..\Cbc\src\;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;."
                                 PreprocessorDefinitions="WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;"
                                 StringPooling="true"
@@ -335 +335 @@
                                 RuntimeTypeInfo="true"
                                 UsePrecompiledHeader="0"
-                                PrecompiledHeaderFile=".\Release/cbcExamplesSample2.pch"
-                                AssemblerListingLocation=".\Release/"
-                                ObjectFile=".\Release/"
-                                ProgramDataBaseFileName=".\Release/"
+                                PrecompiledHeaderFile=".\Release\cbcExamplesSample2.pch"
+                                AssemblerListingLocation=".\Release\"
+                                ObjectFile=".\Release\"
+                                ProgramDataBaseFileName=".\Release\"
                                 WarningLevel="3"
                                 SuppressStartupBanner="true"
@@ -361 +361 @@
                                 SuppressStartupBanner="true"
                                 AdditionalLibraryDirectories="$(OutDir)"
-                                ProgramDatabaseFile=".\Release/cbcExamplesSample2.pdb"
+                                ProgramDatabaseFile=".\Release\cbcExamplesSample2.pdb"
                                 SubSystem="1"
                                 RandomizedBaseAddress="1"
@@ -390 +390 @@
                 </Configuration>
         </Configurations>
+        <References>
+        </References>
         <Files>
                 <Filter
@@ -412 +414 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Release|Win32"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                Optimization="2"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                                ObjectFile="$(IntDir)\"
+                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Debug|x64"
                                         >
@@ -425 +439 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Release|x64"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                Optimization="2"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                                ObjectFile="$(IntDir)\"
+                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+                                        />
+                                </FileConfiguration>
+                        </File>
+                        <File
+                                RelativePath="..\..\..\..\Cbc\examples\CbcCompareUser.cpp"
+                                >
+                                <FileConfiguration
+                                        Name="Debug|Win32"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                Optimization="0"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                                BasicRuntimeChecks="3"
+                                                ObjectFile="$(IntDir)\"
+                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Release|Win32"
                                         >
@@ -437 +480 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Debug|x64"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                Optimization="0"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                                BasicRuntimeChecks="3"
+                                                ObjectFile="$(IntDir)\"
+                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Release|x64"
                                         >
@@ -450 +506 @@
                         </File>
                         <File
-                                RelativePath="..\..\..\src\CbcCbcParam.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\..\Cbc\examples\CbcCompareUser.cpp"
+                                RelativePath="..\..\..\..\Cbc\examples\sample2.cpp"
                                 >
                                 <FileConfiguration
@@ -470 +522 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Release|Win32"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                Optimization="2"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                                ObjectFile="$(IntDir)\"
+                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Debug|x64"
                                         >
@@ -478 +542 @@
                                                 PreprocessorDefinitions=""
                                                 BasicRuntimeChecks="3"
-                                                ObjectFile="$(IntDir)\"
-                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="2"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                                ObjectFile="$(IntDir)\"
-                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|x64"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="2"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                                ObjectFile="$(IntDir)\"
-                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
-                                        />
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\..\..\src\CbcLinked.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\src\CbcLinkedUtils.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\src\CbcSolver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\src\CbcSolver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\src\CbcSolverAnalyze.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\src\CbcSolverExpandKnapsack.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\src\CbcSolverHeuristics.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\..\..\Cbc\examples\sample2.cpp"
-                                >
-                                <FileConfiguration
-                                        Name="Debug|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="0"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                                BasicRuntimeChecks="3"
-                                                ObjectFile="$(IntDir)\"
-                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|x64"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="0"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                                BasicRuntimeChecks="3"
-                                                ObjectFile="$(IntDir)\"
-                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Win32"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="2"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
                                                 ObjectFile="$(IntDir)\"
                                                 ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
@@ -683 +653 @@
                         </File>
                         <File
+                                RelativePath="..\..\..\..\Cgl\src\CglRedSplit2\CglRedSplit2.hpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\..\..\Clp\src\ClpConfig.h"
                                 >
@@ -831 +805 @@
         </Globals>
 </VisualStudioProject>
+

stable/2.8/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj

@@ -46 +46 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
+                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
                                 PreprocessorDefinitions="CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
                                 RuntimeLibrary="3"
@@ -107 +107 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\..\..\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
+                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
                                 PreprocessorDefinitions="CBC_BUILD;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
                                 RuntimeLibrary="2"
@@ -169 +169 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglResidualCapacity"
+                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
                                 PreprocessorDefinitions="CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
                                 RuntimeLibrary="3"
@@ -231 +231 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
+                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
                                 PreprocessorDefinitions="CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS"
                                 RuntimeLibrary="2"
@@ -303 +303 @@
                         </File>
                         <File
+                                RelativePath="..\..\..\src\CbcMipStartIO.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\..\src\CbcSolver.cpp"
                                 >
@@ -333 +337 @@
                         </File>
                         <File
+                                RelativePath="..\..\..\src\CbcMipStartIO.hpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\..\src\CbcSolver.hpp"
                                 >
@@ -359 +367 @@
         </Globals>
 </VisualStudioProject>
+

stable/2.8/Cbc/README

@@ -71 +71 @@
    "On the safety of Gomory cut generators"
    http://faculty.sutd.edu.sg/~nannicini/index.php?page=publications
+
+8. To encourage the use of some of the more exotic/expensive cut generators a parameter -slowcutpasses has been added.
+   The idea is that the code does these cuts just a few times - less than the more usual cuts.  The default is 10.
+   The cut generators identified by "may be slow" at present are just Lift and project and ReduceAndSplit (both versions).
    
-8.  Allow initialization of random seed by user.  Pseudo-random numbers are used in Cbc and Clp.  In Clp they
+9. Allow initialization of random seed by user.  Pseudo-random numbers are used in Cbc and Clp.  In Clp they
    are used to break ties in degenerate problems, while in Cbc heuristics such as the Feasibility Pump use them   
    to decide whether to round up or down.  So if a different pseudo-random seed is given to Clp then you may get
@@ -79 +83 @@
    for initial seed.
    
-9.  Building on this idea Andrea Lodi, Matteo Fischetti, Michele Monaci, Domenico Salvagnin and Andrea Tramontani
-   suggest that this idea be be improved by running at the root node with multiple copies of solver, each
+10. Building on this idea, Andrea Lodi, Matteo Fischetti, Michele Monaci, Domenico Salvagnin, Yuji Shinano, and Andrea Tramontani
+   suggest that this idea be improved by running at the root node with multiple copies of solver, each
    with its own different seed and then passing in the solutions and cuts so that the main solver has a richer
-   set of solutions and possibly stronger cuts.  This is switched on by setting multipleRootPasses.  These can also
+   set of solutions and possibly stronger cuts.  This is switched on by setting -multipleRootPasses.  These can also
    be done in parallel.
  
-10. Few changes to presolve for special variables and badly scaled problems (in CoinUtils).
-
-11. New option -extraVariables <number> which switches on a trivial re-formulation to group variables with same cost together.
-
+11. Few changes to presolve for special variables and badly scaled problems (in CoinUtils).
+
+12. New option -extraVariables <number> which switches on a trivial re-formulation that introduces extra integer variables
+    to group together variables with same cost.
+
+13. For some problems, cut generators and general branching work better if the problem would be infeasible if the cost is too high.
+    If the new option -constraintFromCutoff is set, the objective function is added as a constraint which rhs is set to the current
+    cutoff value (objective value of best known solution).
 
 Release 2.7.8:

stable/2.8/Cbc/examples/CbcBranchFollow2.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
 #include <cassert>
 #include <cmath>
@@ -13 +9 @@
 //#define CBC_DEBUG
 
+#include "CoinPragma.hpp"
 #include "OsiSolverInterface.hpp"
 #include "CbcModel.hpp"

stable/2.8/Cbc/examples/CbcBranchLink.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
 #include <cassert>
 #include <cmath>
@@ -13 +9 @@
 //#define CBC_DEBUG
 
+#include "CoinPragma.hpp"
 #include "OsiSolverInterface.hpp"
 #include "CbcModel.hpp"
@@ -52 +49 @@
     // weights must be increasing
     int i;
-    double last=-COIN_DBL_MAX;
-    for (i=0;i<numberMembers_;i++) {
-      assert (weights_[i]>last+1.0e-12);
-      last=weights_[i];
-    }
+    for (i=0;i<numberMembers_;i++)
+      assert (i == 0 || weights_[i]>weights_[i-1]+1.0e-12);
     for (i=0;i<numberMembers_*numberLinks_;i++) {
       which_[i]=first+i;
@@ -86 +80 @@
     // weights must be increasing
     int i;
-    double last=-COIN_DBL_MAX;
-    for (i=0;i<numberMembers_;i++) {
-      assert (weights_[i]>last+1.0e-12);
-      last=weights_[i];
-    }
+    for (i=0;i<numberMembers_;i++)
+      assert (i == 0 || weights_[i]>weights_[i-1]+1.0e-12);
     for (i=0;i<numberMembers_*numberLinks_;i++) {
       which_[i]= which[i];
@@ -467 +458 @@
 // Creates a branching object
 CbcBranchingObject * 
-CbcLink::createBranch(int way) 
+CbcLink::createCbcBranch(OsiSolverInterface * /*solver*/, const OsiBranchingInformation * /*info*/, int way) 
 {
   int j;

stable/2.8/Cbc/examples/CbcBranchLink.hpp

@@ -58 +58 @@
   virtual void feasibleRegion();
   /// Creates a branching object
-  virtual CbcBranchingObject * createBranch(int way) ;
+  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver, const OsiBranchingInformation * info, int way) ;
 
   /// Number of members

stable/2.8/Cbc/examples/CbcBranchUser.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
 #include <cassert>
 #include <cmath>
 #include <cfloat>
 
+#include "CoinPragma.hpp"
 #include "OsiSolverInterface.hpp"
 #include "CbcModel.hpp"

stable/2.8/Cbc/examples/CbcCompareUser.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
 #include <cassert>
 #include <cmath>
@@ -13 +9 @@
 //#define CBC_DEBUG
 
+#include "CoinPragma.hpp"
 #include "CbcMessage.hpp"
 #include "CbcModel.hpp"

stable/2.8/Cbc/examples/CbcSolver3.cpp

@@ -246 +246 @@
     assert(!modelPtr_->specialOptions());
     int saveOptions = modelPtr_->specialOptions();
-    int startFinishOptions;
     bool takeHint;
     OsiHintStrength strength;
-    bool gotHint = (getHintParam(OsiDoInBranchAndCut,takeHint,strength));
-    assert (gotHint);
+    getHintParam(OsiDoInBranchAndCut,takeHint,strength);
     if (strength!=OsiHintIgnore&&takeHint) {
       // could do something - think about it
@@ -256 +254 @@
     }
     if((specialOptions_&1)==0) {
-      startFinishOptions=0;
       modelPtr_->setSpecialOptions(saveOptions|(64|1024));
     } else {
-      startFinishOptions=1+2+4;
       if((specialOptions_&4)==0) 
         modelPtr_->setSpecialOptions(saveOptions|(64|128|512|1024|4096));

stable/2.8/Cbc/examples/CbcSolverLongThin.cpp

@@ -473 +473 @@
     assert(!modelPtr_->specialOptions());
     int saveOptions = modelPtr_->specialOptions();
-    int startFinishOptions;
     bool takeHint;
     OsiHintStrength strength;
-    bool gotHint = (getHintParam(OsiDoInBranchAndCut,takeHint,strength));
-    assert (gotHint);
+    getHintParam(OsiDoInBranchAndCut,takeHint,strength);
     if (strength!=OsiHintIgnore&&takeHint) {
       // could do something - think about it
@@ -483 +481 @@
     }
     if((specialOptions_&1)==0) {
-      startFinishOptions=0;
       modelPtr_->setSpecialOptions(saveOptions|(64|1024));
     } else {
-      startFinishOptions=1+2+4;
       if((specialOptions_&4)==0) 
         modelPtr_->setSpecialOptions(saveOptions|(64|128|512|1024|4096));

stable/2.8/Cbc/examples/Makefile.in

@@ -21 +21 @@
 OBJS =  $(DRIVER).@OBJEXT@ 
 
-#       CbcCompareUser.@OBJEXT@ \
-#       CbcSolver2.@OBJEXT@ \
-#       CbcSolver3.@OBJEXT@ \
-#       ClpQuadInterface.@OBJEXT@ \
-#       CbcBranchFollow2.@OBJEXT@ \
-#       CbcBranchUser.@OBJEXT@ \
-#       CbcBranchLink.@OBJEXT@
+# extra object files that are required by some examples (we just link them into each one)
+EXTRAOBJS = \
+        CbcCompareUser.@OBJEXT@ \
+        CbcSolver2.@OBJEXT@ \
+        CbcSolver3.@OBJEXT@ \
+        CbcSolverLongThin.@OBJEXT@ \
+        ClpQuadInterface.@OBJEXT@ \
+        CbcBranchFollow2.@OBJEXT@ \
+        CbcBranchUser.@OBJEXT@ \
+        CbcBranchLink.@OBJEXT@
 
 # CHANGEME: Additional libraries
+# e.g., for driver2, put -lOsiCbc here
 ADDLIBS =
 
@@ -89 +93 @@
   INCL = @CBCLIB_CFLAGS_INSTALLED@
 endif
-INCL += $(ADDINCFLAGS)
+INCL += -I@srcdir@ $(ADDINCFLAGS)
 
 # Linker flags
@@ -106 +110 @@
 
 # Here we list all possible generated objects or executables to delete them
-CLEANFILES = \
+CLEANFILES = $(EXTRAOBJS) \
+        allCuts.@OBJEXT@ allCuts@EXEEXT@ \
+        barrier.@OBJEXT@ barrier@EXEEXT@ \
+        cbc_driverC_sos.@OBJEXT@ cbc_driverC_sos@EXEEXT@ \
         crew.@OBJEXT@ crew@EXEEXT@ \
-        barrier.@OBJEXT@ barrier@EXEEXT@ \
+        driver.@OBJEXT@ driver@EXEEXT@ \
         driver2.@OBJEXT@ driver2@EXEEXT@ \
-        driver.@OBJEXT@ driver@EXEEXT@ \
-        dynamic.@OBJEXT@ dynamic@EXEEXT@ \
+        driver3.@OBJEXT@ driver3@EXEEXT@ \
+        driver4.@OBJEXT@ driver4@EXEEXT@ \
         fast0507b.@OBJEXT@ fast0507b@EXEEXT@ \
         fast0507.@OBJEXT@ fast0507@EXEEXT@ \
         gear.@OBJEXT@ gear@EXEEXT@ \
         hotstart.@OBJEXT@ hotstart@EXEEXT@ \
+        interrupt.@OBJEXT@ interrupt@EXEEXT@ \
         link.@OBJEXT@ link@EXEEXT@ \
         longthin.@OBJEXT@ longthin@EXEEXT@ \
         lotsize.@OBJEXT@ lotsize@EXEEXT@ \
         minimum.@OBJEXT@ minimum@EXEEXT@ \
+        modify.@OBJEXT@ modify@EXEEXT@ \
         nway.@OBJEXT@ nway@EXEEXT@ \
         qmip.@OBJEXT@ qmip@EXEEXT@ \
@@ -129 +138 @@
         sample4.@OBJEXT@ sample4@EXEEXT@ \
         sample5.@OBJEXT@ sample5@EXEEXT@ \
+        simpleBAB.@OBJEXT@ simpleBAB@EXEEXT@ \
         sos.@OBJEXT@ sos@EXEEXT@ \
         sudoku.@OBJEXT@ sudoku@EXEEXT@
@@ -136 +146 @@
 .SUFFIXES: .cpp .c .o .obj
 
-$(EXE): $(OBJS)
+$(EXE): $(OBJS) $(EXTRAOBJS)
         bla=;\
-        for file in $(OBJS); do bla="$$bla `$(CYGPATH_W) $$file`"; done; \
+        for file in $(OBJS) $(EXTRAOBJS); do bla="$$bla `$(CYGPATH_W) $$file`"; done; \
         $(CXX) $(CXXLINKFLAGS) $(CXXFLAGS) -o $@ $$bla $(LIBS) $(ADDLIBS)
 

stable/2.8/Cbc/examples/allCuts.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
 
+#include "CoinPragma.hpp"
 // For Branch and bound
 #include "OsiSolverInterface.hpp"
@@ -42 +38 @@
 #include "CbcHeuristic.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 // Need stored cuts
 
@@ -254 +250 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
   OsiClpSolverInterface solverSave = solver1;

stable/2.8/Cbc/examples/barrier.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
 
+#include "CoinPragma.hpp"
 #include "OsiClpSolverInterface.hpp"
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -72 +68 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 

stable/2.8/Cbc/examples/cbc_driverC_sos.c

@@ -4 +4 @@
   This code is licensed under the terms of the Eclipse Public License (EPL).
 
-  $Id#
+  $Id$
 */
 
@@ -77 +77 @@
 #if defined(SAMPLEDIR)
   /*
-    SAMPLEDIR should be something like "path/to/mps/directory/", including the
-    quotes and final directory separator. Don't forget to properly escape
+    SAMPLEDIR should be something like "path/to/mps/directory", including the
+    quotes and excluding the final directory separator. Don't forget to properly escape
     '\' when using native Windows path syntax.
   */
-    status=Cbc_readMps(model,SAMPLEDIR "p0033.mps") ;
+    status=Cbc_readMps(model, SAMPLEDIR "/p0033.mps") ;
 #else
     fprintf(stderr, "Please specify the full path to an MPS file on the command line\n");
@@ -397 +397 @@
       } else {
         int numObjects = numberSets; /* cannot pass const int */
-        Cbc_addSOS_Dense(model, numObjects, len, (const int**)which, (const double*)weights, 2);
+        Cbc_addSOS_Dense(model, numObjects, len, (const int* const *)which, (const double*)weights, 2);
       }
     }

stable/2.8/Cbc/examples/crew.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
-
+#include "CoinPragma.hpp"
 // For Branch and bound
 #include "OsiClpSolverInterface.hpp"
@@ -19 +14 @@
 #include "CbcCompareUser.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 /************************************************************************
@@ -49 +44 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 
@@ -60 +59 @@
   // Point to solver
   OsiSolverInterface * solver3 = model.solver();
-  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver3);
-  assert (osiclp);
+  assert (dynamic_cast< OsiClpSolverInterface*> (solver3));
 
   // Definition of node choice

stable/2.8/Cbc/examples/driver.cpp

@@ -3 +3 @@
 // Corporation and others.  All Rights Reserved.
 // This code is licensed under the terms of the Eclipse Public License (EPL).
-
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
 
 #include <cassert>
@@ -14 +9 @@
 
 // For Branch and bound
+#include "CoinPragma.hpp"
 #include "CbcModel.hpp"
 #include "CbcStrategy.hpp"
@@ -20 +16 @@
 #include "CglPreProcess.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -50 +46 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 

stable/2.8/Cbc/examples/driver2.cpp

@@ -3 +3 @@
 // Corporation and others.  All Rights Reserved.
 // This code is licensed under the terms of the Eclipse Public License (EPL).
-
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
 
 #include <cassert>
@@ -15 +10 @@
 // For Branch and bound
 //#include "CbcStrategy.hpp"
+#include "CoinPragma.hpp"
 #include "OsiCbcSolverInterface.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -50 +46 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
   // Do complete search

stable/2.8/Cbc/examples/driver3.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip> 
 
+#include "CoinPragma.hpp"
 #include "CbcModel.hpp"
 #include "OsiClpSolverInterface.hpp"
 #include "CbcBranchDynamic.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -55 +51 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
 
   // Strip off integer information and save

stable/2.8/Cbc/examples/driver4.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip> 
 
 
+#include "CoinPragma.hpp"
 #include "CbcModel.hpp"
 #include "OsiClpSolverInterface.hpp"
 #include "CbcSolver.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -221 +217 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   // Tell solver to return fast if presolve or initial solve infeasible
   solver1.getModelPtr()->setMoreSpecialOptions(3);

stable/2.8/Cbc/examples/fast0507.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
+#include "CoinPragma.hpp"
 
 // For Branch and bound
@@ -39 +35 @@
 #include "CglPreProcess.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -77 +73 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 

stable/2.8/Cbc/examples/fast0507b.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include "CbcConfig.h"
 
@@ -14 +9 @@
 #include <iomanip>
 
+#include "CoinPragma.hpp"
 
 // For Branch and bound
@@ -39 +35 @@
 #include "CglPreProcess.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -83 +79 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
   /* Options are:

stable/2.8/Cbc/examples/gear.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
+#include "CoinPragma.hpp"
 
 // For Branch and bound
@@ -21 +17 @@
 #include "OsiClpSolverInterface.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 

stable/2.8/Cbc/examples/hotstart.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
+#include "CoinPragma.hpp"
 
 // For Branch and bound
@@ -38 +34 @@
 #include "CbcHeuristic.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -74 +70 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 

stable/2.8/Cbc/examples/interrupt.cpp

@@ -1 @@
-// $Id: interrupt.cpp 1854 2013-01-28 00:02:55Z stefan $
+// $Id$
 // Copyright (C) 2007, International Business Machines
 // Corporation and others.  All Rights Reserved.
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip> 
 
 
+#include "CoinPragma.hpp"
 #include "CbcModel.hpp"
 #include "OsiClpSolverInterface.hpp"
 #include "CbcSolver.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -359 +355 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   // Tell solver to return fast if presolve or initial solve infeasible
   solver1.getModelPtr()->setMoreSpecialOptions(3);

stable/2.8/Cbc/examples/link.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
-
+#include "CoinPragma.hpp"
 // For Branch and bound
 #include "OsiSolverInterface.hpp"
@@ -21 +16 @@
 #include "OsiClpSolverInterface.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 

stable/2.8/Cbc/examples/longthin.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
 
+#include "CoinPragma.hpp"
 // For Branch and bound
 #include "OsiSolverInterface.hpp"
@@ -28 +24 @@
 #include "CglProbing.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 /************************************************************************
@@ -58 +54 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 

stable/2.8/Cbc/examples/lotsize.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
-
+#include "CoinPragma.hpp"
 // For Branch and bound
 #include "CbcModel.hpp"
@@ -50 +45 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   
   int iColumn;

stable/2.8/Cbc/examples/minimum.cpp

@@ -16 +16 @@
 #if defined(SAMPLEDIR)
   int numMpsReadErrors = solver1.readMps(SAMPLEDIR "/p0033.mps","");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
 #else
   fprintf(stderr, "Do not know where to find sample MPS files.\n");

stable/2.8/Cbc/examples/nway.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
 
+#include "CoinPragma.hpp"
 // For Branch and bound
 #include "CbcModel.hpp"
@@ -49 +45 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   
   int iRow, iColumn;

stable/2.8/Cbc/examples/qmip.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
+
+#include "CoinPragma.hpp"
 
 // For Branch and bound
@@ -67 +64 @@
 
   // Read in model using argv[1]
+  if (argc <= 1) {
+     printf("using %s <modelfile>\n", argv[0]);
+     return 1;
+  }
   // must use clp to get a quadratic model
   ClpSimplex * clp = solver1.getModelPtr();
   int numMpsReadErrors = clp->readMps(argv[1]);
   // and assert that it is a clean model
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
 
   // This clones solver 

stable/2.8/Cbc/examples/qmip2.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
+
+#include "CoinPragma.hpp"
 
 // For Branch and bound

stable/2.8/Cbc/examples/repeat.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
+#include "CoinPragma.hpp"
 
 // For Branch and bound
@@ -39 +35 @@
 #include "CbcHeuristic.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -79 +75 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 
@@ -301 +301 @@
     OsiSolverInterface * refSolver = model.referenceSolver();
     const double * bestSolution = model.bestSolution();
+#ifndef NDEBUG
     const double * originalLower = refSolver->getColLower();
     const double * originalUpper = refSolver->getColUpper();
+#endif
     CoinPackedVector cut;
     double rhs = 1.0;

stable/2.8/Cbc/examples/sample1.cpp

@@ -43 +43 @@
   struct rusage usage;
   getrusage(RUSAGE_SELF,&usage);
-  cpu_temp = usage.ru_utime.tv_sec;
+  cpu_temp = (double)usage.ru_utime.tv_sec;
   cpu_temp += 1.0e-6*((double) usage.ru_utime.tv_usec);
 #endif
@@ -87 +87 @@
   // and assert that it is a clean model
 
-  assert(!simplex.readMps(argv[1],""));
+  if (argc <= 1) {
+     printf("using %s <modelfile>\n", argv[0]);
+     return 1;
+  }
+  int numMpsReadErrors = simplex.readMps(argv[1],"");
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   time2 = cpuTime();
   std::cout<<"Input took "<<time2-time1<<" seconds"<<std::endl;;

stable/2.8/Cbc/examples/sample2.cpp

@@ -35 +35 @@
 #include "CbcHeuristic.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 //#############################################################################
@@ -85 +85 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   double time1 = CoinCpuTime();
 

stable/2.8/Cbc/examples/sample3.cpp

@@ -91 +91 @@
   solver1.getModelPtr()->setDualBound(1.0e10);
 
+  if (argc <= 1) {
+     printf("using %s <modelfile>\n", argv[0]);
+     return 1;
+  }
+
   // Read in model using argv[1]
   // and assert that it is a clean model
   int numMpsReadErrors = solver1.readMps(argv[1],"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   // do here so integers correct
   CbcModel model(solver1);

stable/2.8/Cbc/examples/sample4.cpp

@@ -26 +26 @@
 /************************************************************************
 
-This main program reads in an SOSr model (ltw) from an mps file.
+This main program reads in an SOS model (rgn) from an mps file.
 
 It then solves it three ways :-
@@ -32 +32 @@
 a) As normal
 b) SOS 1
-c) SOS 2(so answer will be different)
+c) SOS 2 (so answer will be different)
 
 ************************************************************************/
@@ -46 +46 @@
   model.solver()->setHintParam(OsiDoReducePrint,true,OsiHintTry);
 
-  // Read in ltw.mps
-  // and assert that it is a clean model
-  int numMpsReadErrors = model.solver()->readMps("./ltw.mps","");
-  assert(numMpsReadErrors==0);
+  // Read in rgn.mps
+  std::string mpsFileName;
+#if defined(MIPLIB3DIR)
+  mpsFileName = MIPLIB3DIR "/rgn";
+#else
+  if (argc < 2) {
+    fprintf(stderr, "Do not know where to find miplib3 MPS files.\n");
+    exit(1);
+  }
+#endif
+  if (argc>=2) mpsFileName = argv[1];
+  int numMpsReadErrors = model.solver()->readMps(mpsFileName.c_str(),"");
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
 
   // Definition of node choice
@@ -75 +88 @@
   }
 
-  
+  if (numberColumns!=180 || numberIntegers!=100) {
+    printf("Incorrect model for example\n");
+    exit(1);
+  }
+
   double time1 = CoinCpuTime() ;
 
   model.branchAndBound();
 
-  std::cout<<"ltw.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
+  std::cout<<"rgn.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
            <<model.getNodeCount()<<" nodes with objective "
            <<model.getObjValue()
@@ -104 +121 @@
   model = model2;
 
+  // Convert slacks to variables
+  CoinBigIndex start[5]={0,1,2,3,4};
+  int row[4]={0,1,2,3};
+  double element[4]={1.0,1.0,1.0,1.0};
+  double up[4]={1.0,1.0,1.0,1.0};
+  model.solver()->addCols(4,start,row,element,NULL,up,NULL);
   // Now use SOS1
-  int numberSets=8;
-  int which[28]={20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,
-                 39,40,41,42,43,44,45,46,47};
-  double weights[]={1.0,2.0,3.0,4.0,5.0};
-  int starts[]={0,2,4,6,8,13,18,23,28};
-  CbcObject ** objects = new CbcObject * [numberSets];
+  int numberSets=4;
+  int which[104];
+  double weights[104];
+  int starts[5];
+  // load
+  int n=0;
+  starts[0]=0;
+  for (int iSet=0;iSet<4;iSet++) {
+    for (int i=0;i<25;i++) {
+      weights[n]=i+1.0;
+      which[n]=iSet*25+i;
+      n++;
+    }
+    // slack - make sure first branch is on slack
+    weights[n]=1000.0;
+    which[n]=180+iSet;
+    n++;
+    starts[iSet+1]=n;
+  }
   for (i=0;i<numberIntegers;i++) {
     int iColumn = integerVariable[i];
@@ -116 +152 @@
     model.solver()->setContinuous(iColumn);
   }
+  // save model in this state
+  CbcModel modelSOS = model;
+  CbcObject ** objects = new CbcObject * [numberSets];
   for (i=0;i<numberSets;i++) {
     objects[i]= new CbcSOS(&model,starts[i+1]-starts[i],which+starts[i],
@@ -129 +168 @@
   model.branchAndBound();
 
-  std::cout<<"ltw.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
+  std::cout<<"rgn.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
            <<model.getNodeCount()<<" nodes with objective "
            <<model.getObjValue()
@@ -151 +190 @@
 
 
-  // Restore model
-  model = model2;
+  // Restore SOS model
+  model = modelSOS;
 
 // Now use SOS2
   objects = new CbcObject * [numberSets];
-  for (i=0;i<numberIntegers;i++) {
-    int iColumn = integerVariable[i];
-    // Stop being integer
-    model.solver()->setContinuous(iColumn);
-  }
   for (i=0;i<numberSets;i++) {
     objects[i]= new CbcSOS(&model,starts[i+1]-starts[i],which+starts[i],
@@ -174 +208 @@
   model.branchAndBound();
 
-  std::cout<<"ltw.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
+  std::cout<<"rgn.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
            <<model.getNodeCount()<<" nodes with objective "
            <<model.getObjValue()

stable/2.8/Cbc/examples/sample5.cpp

@@ -40 +40 @@
 #include "CoinModel.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 

stable/2.8/Cbc/examples/simpleBAB.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
 
+#include "CoinPragma.hpp"
 #include "OsiClpSolverInterface.hpp"
 #include "CoinPackedVector.hpp"
@@ -41 +37 @@
   model.setInteger(0);
   model.setObjSense(-1.0);
-  bool optimal;
+  //bool optimal;
   
 #ifndef USE_CBC
@@ -54 +50 @@
   model.getDblParam(OsiDualObjectiveLimit,objLimit);
   model.branchAndBound();
-  optimal = model.isProvenOptimal(); 
+  //optimal = model.isProvenOptimal();
   const double *val = model.getColSolution(); // x0 = 3, x1 = 0.45
   printf("Solution %g %g\n",val[0],val[1]);
@@ -65 +61 @@
     CbcModel model2(model);
     model2.branchAndBound();
-    optimal = model2.isProvenOptimal(); 
+    //optimal = model2.isProvenOptimal();
     const double *val = model2.getColSolution(); // x0 = 3, x1 = 0.45
     printf("Solution %g %g\n",val[0],val[1]);
@@ -79 +75 @@
 #ifndef USE_CBC
   model.branchAndBound();
-  optimal = model.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
+  //optimal = model.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
   // Address of solution will be same as only adding rows - but be safe
   val = model.getColSolution();
@@ -87 +83 @@
     CbcModel model2(model);
     model2.branchAndBound();
-    optimal = model2.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
+    //optimal = model2.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
     const double *val = model2.getColSolution(); 
     printf("Solution %g %g\n",val[0],val[1]);

stable/2.8/Cbc/examples/sos.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
+
+#include "CoinPragma.hpp"
 
 // For Branch and bound
@@ -49 +46 @@
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
-  assert(numMpsReadErrors==0);
+  if( numMpsReadErrors != 0 )
+  {
+     printf("%d errors reading MPS file\n", numMpsReadErrors);
+     return numMpsReadErrors;
+  }
   
   int iRow, iColumn;

stable/2.8/Cbc/examples/sudoku.cpp

@@ -4 +4 @@
 // This code is licensed under the terms of the Eclipse Public License (EPL).
 
-#if defined(_MSC_VER)
-// Turn off compiler warning about long names
-#  pragma warning(disable:4786)
-#endif
-
 #include <cassert>
 #include <iomanip>
 
 
+#include "CoinPragma.hpp"
 // For Branch and bound
 #include "OsiSolverInterface.hpp"
@@ -26 +22 @@
 #include "CglStored.hpp"
 
-#include  "CoinTime.hpp"
+#include "CoinTime.hpp"
 
 

stable/2.8/Cbc/src/CbcFathom.hpp

@@ -76 +76 @@
 
 };
-#ifdef COIN_HAS_CLP
+
 #include "OsiClpSolverInterface.hpp"
 
@@ -136 +136 @@
 };
 #endif
-#endif
-

stable/2.8/Cbc/src/CbcModel.cpp

@@ -6265 +6265 @@
     maximumDepthActual_ = 0;
     numberDJFixed_ = 0.0;
-    delete probingInfo_;
-    probingInfo_ = NULL;
+    if (probingInfo_) {
+      delete probingInfo_;
+      probingInfo_ = NULL;
+      if (!generator_)
+        numberCutGenerators_=0;
+      // also get rid of cut generator
+      int n=0;
+      for (int i = 0; i < numberCutGenerators_; i++) {
+        CglImplication * cutGen;
+        cutGen = dynamic_cast<CglImplication *>(generator_[i]->generator());
+        if (!cutGen) {
+          generator_[n]=generator_[i];
+          virginGenerator_[n]=virginGenerator_[i];
+          n++;
+        } else {
+          cutGen->setProbingInfo(NULL);
+          delete generator_[i];
+          cutGen = dynamic_cast<CglImplication *>(virginGenerator_[i]->generator());
+          assert (cutGen);
+          cutGen->setProbingInfo(NULL);
+          delete virginGenerator_[i];
+        }
+      }
+      numberCutGenerators_=n;
+    }
     maximumStatistics_ = 0;
     delete [] analyzeResults_;
@@ -16311 +16334 @@
     }
 }
+#else
+CbcModel::goToDantzig(int numberNodes, ClpDualRowPivot *& savePivotMethod)
+{
+   printf("Need Clp to go to Dantzig\n");
+   abort();
+}
 #endif
 // Below this is deprecated or at least fairly deprecated

stable/2.8/Cbc/src/CbcModel.hpp

@@ -39 +39 @@
 class CbcEventHandler ;
 class CglPreProcess;
-# ifdef COIN_HAS_CLP
 class OsiClpSolverInterface;
 class ClpNodeStuff;
-#endif
+
 // #define CBC_CHECK_BASIS 1
 
@@ -1860 +1859 @@
     { temporaryPointer_=pointer;}
     /// Go to dantzig pivot selection if easy problem (clp only)
-#ifdef COIN_HAS_CLP
     void goToDantzig(int numberNodes, ClpDualRowPivot *& savePivotMethod);
-#endif
     /// Now we may not own objects - just point to solver's objects
     inline bool ownObjects() const {
@@ -2272 +2269 @@
         maximumNumberIterations_ = value;
     }
-# ifdef COIN_HAS_CLP
     /// Set depth for fast nodes
     inline void setFastNodeDepth(int value) {
@@ -2293 +2289 @@
         numberExtraIterations_ += iterations;
     }
-#endif
     /// Number of extra iterations
     inline int numberExtraIterations() const {

stable/2.8/Cbc/src/CbcSOS.cpp

@@ -222 +222 @@
                 // Could change to #ifdef CBC_DEBUG
 #ifndef NDEBUG
-                if (model_->messageHandler()->logLevel() > 2)
+                if (model_->messageHandler()->logLevel() > 2 &&
+                    value > upper[iColumn] + integerTolerance)
                     printf("** Variable %d (%d) has value %g and upper bound of %g\n",
                            iColumn, j, value, upper[iColumn]);

stable/2.8/Cbc/src/CbcThread.cpp

@@ -1127 +1127 @@
             if (thisModel->parallelMode() >= 0) {
                 CbcNode * node = stuff->node();
-                assert (node->nodeInfo());
+                //assert (node->nodeInfo());
                 CbcNode * createdNode = stuff->createdNode();
-                thisModel->doOneNode(baseModel, node, createdNode);
+                // try and see if this has slipped through
+                if (node) {
+                  thisModel->doOneNode(baseModel, node, createdNode);
+                } else {
+                  //printf("null node\n");
+                  createdNode=NULL;
+                }
                 stuff->setNode(node);
                 stuff->setCreatedNode(createdNode);

stable/2.8/Cbc/src/Cbc_C_Interface.cpp

@@ -2266 +2266 @@
 COINLIBAPI void  COINLINKAGE
 Cbc_addSOS_Dense(Cbc_Model * model, int numObjects, const int * len,
-                 const int ** which, const double * weights, const int type)
+                 const int * const* which, const double * weights, const int type)
 {
     const char prefix[] = "Cbc_C_Interface::Cbc_addSOS_Dense(): ";

stable/2.8/Cbc/src/Cbc_C_Interface.h

@@ -629 +629 @@
     COINLIBAPI void  COINLINKAGE
     Cbc_addSOS_Dense(Cbc_Model * model, int numObjects, const int * len,
-                     const int ** which, const double * weights, const int type)
+                     const int * const * which, const double * weights, const int type)
     ;
     /** Add SOS constraints to the model using row-order matrix */

stable/2.8/Cbc/src/Makefile.am

@@ -193 +193 @@
         CbcBranchDynamic.hpp \
         CbcBranchCut.hpp \
-        CbcBranchDecision.hpp \
+        CbcBranchDecision.hpp \
         CbcBranchDefaultDecision.hpp \
         CbcBranchingObject.hpp \
@@ -214 +214 @@
         CbcFathom.hpp \
         CbcEventHandler.hpp \
+        CbcFathomDynamicProgramming.hpp \
         CbcFeasibilityBase.hpp \
         CbcFixVariable.hpp \

stable/2.8/Cbc/src/Makefile.in

@@ -653 +653 @@
         CbcBranchDynamic.hpp \
         CbcBranchCut.hpp \
-        CbcBranchDecision.hpp \
+        CbcBranchDecision.hpp \
         CbcBranchDefaultDecision.hpp \
         CbcBranchingObject.hpp \
@@ -674 +674 @@
         CbcFathom.hpp \
         CbcEventHandler.hpp \
+        CbcFathomDynamicProgramming.hpp \
         CbcFeasibilityBase.hpp \
         CbcFixVariable.hpp \