Changeset 1902


Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
190 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/INSTALL

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/LICENSE

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/MSVisualStudio/v10/CbcCSosDllSample/cbcCSosDllSample.vcxproj

    r1873 r1902  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>Application</ConfigurationType>
    29     <CharacterSet>MultiByte</CharacterSet>
    3029  </PropertyGroup>
    3130  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3231    <ConfigurationType>Application</ConfigurationType>
    33     <CharacterSet>MultiByte</CharacterSet>
    3432  </PropertyGroup>
    3533  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3634    <ConfigurationType>Application</ConfigurationType>
    37     <CharacterSet>MultiByte</CharacterSet>
    3835  </PropertyGroup>
    3936  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4037    <ConfigurationType>Application</ConfigurationType>
    41     <CharacterSet>MultiByte</CharacterSet>
    4238  </PropertyGroup>
    4339  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4642  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    4743    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     44    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     45    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    4846  </ImportGroup>
    4947  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5048    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     49    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     50    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5151  </ImportGroup>
    5252  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5353    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     54    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     55    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5456  </ImportGroup>
    5557  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    5658    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     59    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     60    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5761  </ImportGroup>
    5862  <PropertyGroup Label="UserMacros" />
    5963  <PropertyGroup>
    6064    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    61     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    62     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6365    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    64     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    65     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6666    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    67     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    68     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    6967    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7268    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    7369    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     
    8682  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8783    <ClCompile>
    88       <Optimization>Disabled</Optimization>
     84      <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>
     85      <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>
     86      <MinimalRebuild>true</MinimalRebuild>
     87      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     88      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     89      <PrecompiledHeader>
     90      </PrecompiledHeader>
     91      <CallingConvention>Cdecl</CallingConvention>
     92      <CompileAs>Default</CompileAs>
     93    </ClCompile>
     94    <ProjectReference>
     95      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     96    </ProjectReference>
     97    <Link>
     98      <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     99      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     100      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
     101      <GenerateDebugInformation>true</GenerateDebugInformation>
     102      <GenerateMapFile>true</GenerateMapFile>
     103      <MapExports>true</MapExports>
     104      <SubSystem>Console</SubSystem>
     105      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     106      <DataExecutionPrevention>
     107      </DataExecutionPrevention>
     108      <TargetMachine>MachineX86</TargetMachine>
     109    </Link>
     110  </ItemDefinitionGroup>
     111  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     112    <ClCompile>
     113      <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>
     114      <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>
     115      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     116      <PrecompiledHeader>
     117      </PrecompiledHeader>
     118      <CallingConvention>Cdecl</CallingConvention>
     119      <CompileAs>Default</CompileAs>
     120    </ClCompile>
     121    <ProjectReference>
     122      <LinkLibraryDependencies>false</LinkLibraryDependencies>
     123    </ProjectReference>
     124    <Link>
     125      <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
     126      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     127      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
     128      <GenerateDebugInformation>true</GenerateDebugInformation>
     129      <GenerateMapFile>true</GenerateMapFile>
     130      <MapExports>true</MapExports>
     131      <SubSystem>Console</SubSystem>
     132      <OptimizeReferences>true</OptimizeReferences>
     133      <EnableCOMDATFolding>true</EnableCOMDATFolding>
     134      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     135      <DataExecutionPrevention>
     136      </DataExecutionPrevention>
     137      <TargetMachine>MachineX86</TargetMachine>
     138    </Link>
     139  </ItemDefinitionGroup>
     140  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     141    <Midl>
     142      <TargetEnvironment>X64</TargetEnvironment>
     143    </Midl>
     144    <ClCompile>
    89145      <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>
    90146      <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>
     
    94150      <PrecompiledHeader>
    95151      </PrecompiledHeader>
    96       <WarningLevel>Level3</WarningLevel>
    97       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    98       <CallingConvention>Cdecl</CallingConvention>
    99       <CompileAs>Default</CompileAs>
    100     </ClCompile>
    101     <ProjectReference>
    102       <LinkLibraryDependencies>false</LinkLibraryDependencies>
    103     </ProjectReference>
    104     <Link>
    105       <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
    106       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    107       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
    108       <GenerateDebugInformation>true</GenerateDebugInformation>
    109       <GenerateMapFile>true</GenerateMapFile>
    110       <MapExports>true</MapExports>
    111       <SubSystem>Console</SubSystem>
    112       <RandomizedBaseAddress>false</RandomizedBaseAddress>
    113       <DataExecutionPrevention>
    114       </DataExecutionPrevention>
    115       <TargetMachine>MachineX86</TargetMachine>
    116     </Link>
    117   </ItemDefinitionGroup>
    118   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    119     <ClCompile>
    120       <Optimization>MaxSpeed</Optimization>
    121       <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>
    122       <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>
    123       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    124       <PrecompiledHeader>
    125       </PrecompiledHeader>
    126       <WarningLevel>Level3</WarningLevel>
    127       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    128       <CallingConvention>Cdecl</CallingConvention>
    129       <CompileAs>Default</CompileAs>
    130     </ClCompile>
    131     <ProjectReference>
    132       <LinkLibraryDependencies>false</LinkLibraryDependencies>
    133     </ProjectReference>
    134     <Link>
    135       <AdditionalDependencies>cbcCInterfaceDll.lib;%(AdditionalDependencies)</AdditionalDependencies>
    136       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    137       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
    138       <GenerateDebugInformation>true</GenerateDebugInformation>
    139       <GenerateMapFile>true</GenerateMapFile>
    140       <MapExports>true</MapExports>
    141       <SubSystem>Console</SubSystem>
    142       <OptimizeReferences>true</OptimizeReferences>
    143       <EnableCOMDATFolding>true</EnableCOMDATFolding>
    144       <RandomizedBaseAddress>false</RandomizedBaseAddress>
    145       <DataExecutionPrevention>
    146       </DataExecutionPrevention>
    147       <TargetMachine>MachineX86</TargetMachine>
    148     </Link>
    149   </ItemDefinitionGroup>
    150   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    151     <Midl>
    152       <TargetEnvironment>X64</TargetEnvironment>
    153     </Midl>
    154     <ClCompile>
    155       <Optimization>Disabled</Optimization>
    156       <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>
    157       <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>
    158       <MinimalRebuild>true</MinimalRebuild>
    159       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    160       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    161       <PrecompiledHeader>
    162       </PrecompiledHeader>
    163       <WarningLevel>Level3</WarningLevel>
    164152      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    165153      <CallingConvention>Cdecl</CallingConvention>
     
    188176    </Midl>
    189177    <ClCompile>
    190       <Optimization>MaxSpeed</Optimization>
    191178      <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>
    192179      <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>
     
    194181      <PrecompiledHeader>
    195182      </PrecompiledHeader>
    196       <WarningLevel>Level3</WarningLevel>
    197       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    198183      <CallingConvention>Cdecl</CallingConvention>
    199184      <CompileAs>Default</CompileAs>
  • stable/2.8/Cbc/MSVisualStudio/v10/OsiCbcUnitTest/OsiCbcUnitTest.vcxproj

    r1873 r1902  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>Application</ConfigurationType>
    29     <CharacterSet>Unicode</CharacterSet>
    30     <WholeProgramOptimization>true</WholeProgramOptimization>
    3129  </PropertyGroup>
    3230  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3331    <ConfigurationType>Application</ConfigurationType>
    34     <CharacterSet>Unicode</CharacterSet>
    3532  </PropertyGroup>
    3633  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3734    <ConfigurationType>Application</ConfigurationType>
    38     <CharacterSet>Unicode</CharacterSet>
    39     <WholeProgramOptimization>true</WholeProgramOptimization>
    4035  </PropertyGroup>
    4136  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4237    <ConfigurationType>Application</ConfigurationType>
    43     <CharacterSet>Unicode</CharacterSet>
    4438  </PropertyGroup>
    4539  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4842  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    4943    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     44    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     45    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5046  </ImportGroup>
    5147  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5248    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     49    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     50    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5351  </ImportGroup>
    5452  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5553    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     54    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     55    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5656  </ImportGroup>
    5757  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    5858    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     59    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     60    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5961  </ImportGroup>
    6062  <PropertyGroup Label="UserMacros" />
    6163  <PropertyGroup>
    6264    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    63     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    64     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6565    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    66     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    67     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6866    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    69     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    70     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7167    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    72     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    73     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7468    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    7569    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     
    8882  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8983    <ClCompile>
    90       <Optimization>Disabled</Optimization>
    9184      <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9285      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";NETLIBDIR="..\\..\\..\\..\\Data\\Netlib";MIPLIBDIR="..\\..\\..\\..\\Data\\miplib3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    93       <MinimalRebuild>true</MinimalRebuild>
    94       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    95       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    96       <PrecompiledHeader>
    97       </PrecompiledHeader>
    98       <WarningLevel>Level3</WarningLevel>
    99       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     86      <PrecompiledHeader>
     87      </PrecompiledHeader>
    10088    </ClCompile>
    10189    <Link>
     
    112100  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    113101    <ClCompile>
    114       <Optimization>MaxSpeed</Optimization>
    115       <IntrinsicFunctions>true</IntrinsicFunctions>
    116102      <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    117103      <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>
    118       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    119       <FunctionLevelLinking>true</FunctionLevelLinking>
    120       <PrecompiledHeader>
    121       </PrecompiledHeader>
    122       <WarningLevel>Level3</WarningLevel>
    123       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     104      <PrecompiledHeader>
     105      </PrecompiledHeader>
    124106    </ClCompile>
    125107    <Link>
     
    141123    </Midl>
    142124    <ClCompile>
    143       <Optimization>Disabled</Optimization>
    144125      <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    145126      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";NETLIBDIR="..\\..\\..\\..\\Data\\Netlib";MIPLIBDIR="..\\..\\..\\..\\Data\\miplib3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    146       <MinimalRebuild>true</MinimalRebuild>
    147       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    148       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    149       <PrecompiledHeader>
    150       </PrecompiledHeader>
    151       <WarningLevel>Level3</WarningLevel>
    152       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     127      <PrecompiledHeader>
     128      </PrecompiledHeader>
    153129    </ClCompile>
    154130    <Link>
     
    168144    </Midl>
    169145    <ClCompile>
    170       <Optimization>MaxSpeed</Optimization>
    171       <IntrinsicFunctions>true</IntrinsicFunctions>
    172146      <AdditionalIncludeDirectories>..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\src\OsiCbc;..\..\..\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\OsiCommonTest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    173147      <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>
    174       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    175       <FunctionLevelLinking>true</FunctionLevelLinking>
    176       <PrecompiledHeader>
    177       </PrecompiledHeader>
    178       <WarningLevel>Level3</WarningLevel>
    179       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     148      <PrecompiledHeader>
     149      </PrecompiledHeader>
    180150    </ClCompile>
    181151    <Link>
  • stable/2.8/Cbc/MSVisualStudio/v10/cbc/cbc.vcxproj

    r1873 r1902  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
    28     <PlatformToolset>v100</PlatformToolset>
    2928  </PropertyGroup>
    3029  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3130    <ConfigurationType>Application</ConfigurationType>
    32     <PlatformToolset>v90</PlatformToolset>
    3331  </PropertyGroup>
    3432  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    3735  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3836    <ConfigurationType>Application</ConfigurationType>
    39     <PlatformToolset>v100</PlatformToolset>
    4037  </PropertyGroup>
    4138  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    9794      <PrecompiledHeader>
    9895      </PrecompiledHeader>
    99       <WarningLevel>Level3</WarningLevel>
    100       <SuppressStartupBanner>true</SuppressStartupBanner>
    101       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    102       <CompileAs>Default</CompileAs>
    10396    </ClCompile>
    10497    <ResourceCompile>
     
    165158      <PrecompiledHeader>
    166159      </PrecompiledHeader>
    167       <WarningLevel>Level3</WarningLevel>
    168       <SuppressStartupBanner>true</SuppressStartupBanner>
    169160      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    170       <CompileAs>Default</CompileAs>
    171161    </ClCompile>
    172162    <ResourceCompile>
  • stable/2.8/Cbc/MSVisualStudio/v10/cbcCInterfaceDll/cbcCInterfaceDll.vcxproj

    r1873 r1902  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>DynamicLibrary</ConfigurationType>
    29     <CharacterSet>MultiByte</CharacterSet>
    3029  </PropertyGroup>
    3130  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3231    <ConfigurationType>DynamicLibrary</ConfigurationType>
    33     <CharacterSet>MultiByte</CharacterSet>
    3432  </PropertyGroup>
    3533  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3634    <ConfigurationType>DynamicLibrary</ConfigurationType>
    37     <CharacterSet>MultiByte</CharacterSet>
    3835  </PropertyGroup>
    3936  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4037    <ConfigurationType>DynamicLibrary</ConfigurationType>
    41     <CharacterSet>MultiByte</CharacterSet>
    4238  </PropertyGroup>
    4339  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    4743    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    4844    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     45    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     46    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    4947  </ImportGroup>
    5048  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5149    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5250    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     51    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     52    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5353  </ImportGroup>
    5454  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5555    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5656    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     57    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     58    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5759  </ImportGroup>
    5860  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    5961    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6062    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     63    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     64    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    6165  </ImportGroup>
    6266  <PropertyGroup Label="UserMacros" />
    6367  <PropertyGroup>
    6468    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    65     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    66     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    6769    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7070    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    71     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    72     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7371    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
    74     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    75     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7672    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    7773    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
  • stable/2.8/Cbc/MSVisualStudio/v10/cbcExamplesSample2/cbcExamplesSample2.vcxproj

    r1873 r1902  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
    28     <UseOfMfc>false</UseOfMfc>
    29     <CharacterSet>MultiByte</CharacterSet>
    3028  </PropertyGroup>
    3129  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3230    <ConfigurationType>Application</ConfigurationType>
    33     <UseOfMfc>false</UseOfMfc>
    34     <CharacterSet>MultiByte</CharacterSet>
    3531  </PropertyGroup>
    3632  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3733    <ConfigurationType>Application</ConfigurationType>
    38     <UseOfMfc>false</UseOfMfc>
    39     <CharacterSet>MultiByte</CharacterSet>
    4034  </PropertyGroup>
    4135  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    4236    <ConfigurationType>Application</ConfigurationType>
    43     <UseOfMfc>false</UseOfMfc>
    44     <CharacterSet>MultiByte</CharacterSet>
    4537  </PropertyGroup>
    4638  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    5042    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5143    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     44    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     45    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5246  </ImportGroup>
    5347  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    5448    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5549    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     50    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     51    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    5652  </ImportGroup>
    5753  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    5854    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    5955    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     56    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Release.props" />
     57    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    6058  </ImportGroup>
    6159  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    6260    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    6361    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
     62    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Debug.props" />
     63    <Import Project="..\..\..\..\BuildTools\MSVisualStudio\v10\Common.props" />
    6464  </ImportGroup>
    6565  <PropertyGroup Label="UserMacros" />
    6666  <PropertyGroup>
    6767    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7068    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
    71     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    72     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7369    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
    74     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    75     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7670    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    77     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    78     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    7971    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    8072    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     
    9890    </Midl>
    9991    <ClCompile>
    100       <Optimization>Disabled</Optimization>
    101       <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>
     92      <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>
    10293      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    103       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    104       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    105       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    10694      <PrecompiledHeader>
    10795      </PrecompiledHeader>
    108       <PrecompiledHeaderOutputFile>.\Debug/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
    109       <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    110       <ObjectFileName>.\Debug/</ObjectFileName>
    111       <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
    112       <WarningLevel>Level3</WarningLevel>
    113       <SuppressStartupBanner>true</SuppressStartupBanner>
    114       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    115       <CompileAs>Default</CompileAs>
    11696    </ClCompile>
    11797    <ResourceCompile>
     
    120100    </ResourceCompile>
    121101    <Link>
    122       <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     102      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
    123103      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
    124104      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    144124    </Midl>
    145125    <ClCompile>
    146       <Optimization>Disabled</Optimization>
    147       <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>
     126      <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>
    148127      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    149       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    150       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    151       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    152128      <PrecompiledHeader>
    153129      </PrecompiledHeader>
    154       <PrecompiledHeaderOutputFile>.\Debug/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
    155       <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
    156       <ObjectFileName>.\Debug/</ObjectFileName>
    157       <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
    158       <WarningLevel>Level3</WarningLevel>
    159       <SuppressStartupBanner>true</SuppressStartupBanner>
    160       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    161       <CompileAs>Default</CompileAs>
    162130    </ClCompile>
    163131    <ResourceCompile>
     
    166134    </ResourceCompile>
    167135    <Link>
    168       <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     136      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
    169137      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
    170138      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    189157    </Midl>
    190158    <ClCompile>
    191       <Optimization>MaxSpeed</Optimization>
    192       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    193       <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>
     159      <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>
    194160      <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>
    195       <StringPooling>true</StringPooling>
    196       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    197       <FunctionLevelLinking>true</FunctionLevelLinking>
    198       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    199161      <PrecompiledHeader>
    200162      </PrecompiledHeader>
    201       <PrecompiledHeaderOutputFile>.\Release/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
    202       <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
    203       <ObjectFileName>.\Release/</ObjectFileName>
    204       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
    205       <WarningLevel>Level3</WarningLevel>
    206       <SuppressStartupBanner>true</SuppressStartupBanner>
    207       <CompileAs>Default</CompileAs>
    208163    </ClCompile>
    209164    <ResourceCompile>
     
    212167    </ResourceCompile>
    213168    <Link>
    214       <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     169      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
    215170      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
    216171      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    235190    </Midl>
    236191    <ClCompile>
    237       <Optimization>MaxSpeed</Optimization>
    238       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    239       <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>
     192      <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>
    240193      <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>
    241       <StringPooling>true</StringPooling>
    242       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    243       <FunctionLevelLinking>true</FunctionLevelLinking>
    244       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    245194      <PrecompiledHeader>
    246195      </PrecompiledHeader>
    247       <PrecompiledHeaderOutputFile>.\Release/cbcExamplesSample2.pch</PrecompiledHeaderOutputFile>
    248       <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
    249       <ObjectFileName>.\Release/</ObjectFileName>
    250       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
    251       <WarningLevel>Level3</WarningLevel>
    252       <SuppressStartupBanner>true</SuppressStartupBanner>
    253       <CompileAs>Default</CompileAs>
    254196    </ClCompile>
    255197    <ResourceCompile>
     
    258200    </ResourceCompile>
    259201    <Link>
    260       <AdditionalDependencies>libCoinUtils.lib;libOsi.lib;libClp.lib;libOsiClp.lib;libCgl.lib;libCbc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     202      <AdditionalDependencies>libCbcSolver.lib;libCbc.lib;libCgl.lib;libOsiClp.lib;libOsi.lib;libClp.lib;libCoinUtils.lib;%(AdditionalDependencies)</AdditionalDependencies>
    261203      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
    262204      <SuppressStartupBanner>true</SuppressStartupBanner>
     
    298240      <ProgramDataBaseFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)vc90.pdb</ProgramDataBaseFileName>
    299241    </ClCompile>
    300     <ClCompile Include="..\..\..\src\CbcCbcParam.cpp" />
    301242    <ClCompile Include="..\..\..\examples\CbcCompareUser.cpp">
    302243      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
     
    323264      <ProgramDataBaseFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)vc90.pdb</ProgramDataBaseFileName>
    324265    </ClCompile>
    325     <ClCompile Include="..\..\..\src\CbcLinked.cpp" />
    326     <ClCompile Include="..\..\..\src\CbcLinkedUtils.cpp" />
    327     <ClCompile Include="..\..\..\src\CbcSolver.cpp" />
    328     <ClCompile Include="..\..\..\src\CbcSolverAnalyze.cpp" />
    329     <ClCompile Include="..\..\..\src\CbcSolverExpandKnapsack.cpp" />
    330     <ClCompile Include="..\..\..\src\CbcSolverHeuristics.cpp" />
    331266    <ClCompile Include="..\..\..\examples\sample2.cpp">
    332267      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
     
    353288      <ProgramDataBaseFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)vc90.pdb</ProgramDataBaseFileName>
    354289    </ClCompile>
    355     <ClCompile Include="..\..\..\src\unitTestClp.cpp" />
    356290  </ItemGroup>
    357291  <ItemGroup>
    358     <ClInclude Include="..\..\..\src\CbcBranchBase.hpp" />
    359292    <ClInclude Include="..\..\..\examples\CbcBranchUser.hpp" />
    360     <ClInclude Include="..\..\..\src\CbcCompareBase.hpp" />
    361293    <ClInclude Include="..\..\..\examples\CbcCompareUser.hpp" />
    362     <ClInclude Include="..\..\..\src\CbcCutGenerator.hpp" />
    363     <ClInclude Include="..\..\..\src\CbcHeuristic.hpp" />
    364     <ClInclude Include="..\..\..\src\CbcHeuristicLocal.hpp" />
    365     <ClInclude Include="..\..\..\src\CbcMessage.hpp" />
    366     <ClInclude Include="..\..\..\src\CbcModel.hpp" />
    367     <ClInclude Include="..\..\..\src\CbcNode.hpp" />
    368     <ClInclude Include="..\..\..\src\CbcStrategy.hpp" />
    369     <ClInclude Include="..\..\..\src\CbcTree.hpp" />
    370     <ClInclude Include="..\..\..\..\Cgl\src\CglClique\CglClique.hpp" />
    371     <ClInclude Include="..\..\..\..\Cgl\src\CglCutGenerator.hpp" />
    372     <ClInclude Include="..\..\..\..\Cgl\src\CglFlowCover\CglFlowCover.hpp" />
    373     <ClInclude Include="..\..\..\..\Cgl\src\CglGomory\CglGomory.hpp" />
    374     <ClInclude Include="..\..\..\..\Cgl\src\CglKnapsackCover\CglKnapsackCover.hpp" />
    375     <ClInclude Include="..\..\..\..\Cgl\src\CglMixedIntegerRounding2\CglMixedIntegerRounding2.hpp" />
    376     <ClInclude Include="..\..\..\..\Cgl\src\CglPreProcess\CglPreProcess.hpp" />
    377     <ClInclude Include="..\..\..\..\Cgl\src\CglProbing\CglProbing.hpp" />
    378     <ClInclude Include="..\..\..\..\Cgl\src\CglRedSplit\CglRedSplit.hpp" />
    379     <ClInclude Include="..\..\..\..\Clp\src\ClpConfig.h" />
    380     <ClInclude Include="..\..\..\..\Clp\src\ClpMatrixBase.hpp" />
    381     <ClInclude Include="..\..\..\..\Clp\src\ClpModel.hpp" />
    382     <ClInclude Include="..\..\..\..\Clp\src\ClpObjective.hpp" />
    383     <ClInclude Include="..\..\..\..\Clp\src\ClpParameters.hpp" />
    384     <ClInclude Include="..\..\..\..\Clp\src\ClpSimplex.hpp" />
    385     <ClInclude Include="..\..\..\..\Clp\src\ClpSolve.hpp" />
    386     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinDistance.hpp" />
    387     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinError.hpp" />
    388     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinFinite.hpp" />
    389     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinFloatEqual.hpp" />
    390     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinHelperFunctions.hpp" />
    391     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinIndexedVector.hpp" />
    392     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinMessage.hpp" />
    393     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinMessageHandler.hpp" />
    394     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPackedMatrix.hpp" />
    395     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPackedVector.hpp" />
    396     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPackedVectorBase.hpp" />
    397     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPragma.hpp" />
    398     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinPresolveMatrix.hpp" />
    399     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinShallowPackedVector.hpp" />
    400     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinSort.hpp" />
    401     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinTime.hpp" />
    402     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinWarmStart.hpp" />
    403     <ClInclude Include="..\..\..\..\CoinUtils\src\CoinWarmStartBasis.hpp" />
    404294    <ClInclude Include="..\..\..\..\BuildTools\headers\configall_system.h" />
    405295    <ClInclude Include="..\..\..\..\BuildTools\headers\configall_system_msc.h" />
    406     <ClInclude Include="..\..\..\..\Osi\src\OsiClp\OsiClpSolverInterface.hpp" />
    407     <ClInclude Include="..\..\..\..\Osi\src\OsiColCut.hpp" />
    408     <ClInclude Include="..\..\..\..\Osi\src\OsiCollections.hpp" />
    409     <ClInclude Include="..\..\..\..\Osi\src\OsiCut.hpp" />
    410     <ClInclude Include="..\..\..\..\Osi\src\OsiCuts.hpp" />
    411     <ClInclude Include="..\..\..\..\Osi\src\OsiPresolve.hpp" />
    412     <ClInclude Include="..\..\..\..\Osi\src\OsiRowCut.hpp" />
    413     <ClInclude Include="..\..\..\..\Osi\src\OsiSolverInterface.hpp" />
    414     <ClInclude Include="..\..\..\..\Osi\src\OsiSolverParameters.hpp" />
    415296  </ItemGroup>
    416297  <ItemGroup>
  • stable/2.8/Cbc/MSVisualStudio/v10/libCbc/libCbc.vcxproj

    r1873 r1902  
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>StaticLibrary</ConfigurationType>
    28     <PlatformToolset>v100</PlatformToolset>
    2928  </PropertyGroup>
    3029  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3130    <ConfigurationType>StaticLibrary</ConfigurationType>
    32     <PlatformToolset>v90</PlatformToolset>
    3331  </PropertyGroup>
    3432  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    3735  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3836    <ConfigurationType>StaticLibrary</ConfigurationType>
    39     <PlatformToolset>v100</PlatformToolset>
    4037  </PropertyGroup>
    4138  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    8683      <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>
    8784      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    88       <MinimalRebuild>true</MinimalRebuild>
    89       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    9085      <PrecompiledHeader>
    9186      </PrecompiledHeader>
    92       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    93       <ShowIncludes>false</ShowIncludes>
    9487    </ClCompile>
    9588    <ResourceCompile>
  • stable/2.8/Cbc/MSVisualStudio/v10/libCbcSolver/libCbcSolver.vcxproj

    r1873 r1902  
    2727  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2828    <ConfigurationType>StaticLibrary</ConfigurationType>
    29     <PlatformToolset>v100</PlatformToolset>
    3029  </PropertyGroup>
    3130  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3231    <ConfigurationType>StaticLibrary</ConfigurationType>
    33     <PlatformToolset>v90</PlatformToolset>
    3432  </PropertyGroup>
    3533  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    3836  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3937    <ConfigurationType>StaticLibrary</ConfigurationType>
    40     <PlatformToolset>v100</PlatformToolset>
    4138  </PropertyGroup>
    4239  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    8178  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    8279    <ClCompile>
    83       <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>
     80      <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>
    8481      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8582      <PrecompiledHeader>
    8683      </PrecompiledHeader>
    87       <WarningLevel>Level3</WarningLevel>
    88       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    8984    </ClCompile>
    9085  </ItemDefinitionGroup>
    9186  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    9287    <ClCompile>
    93       <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>
     88      <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>
    9489      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9590      <PrecompiledHeader>
     
    10499    </Midl>
    105100    <ClCompile>
    106       <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>
     101      <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>
    107102      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    108103      <PrecompiledHeader>
     
    117112    </Midl>
    118113    <ClCompile>
    119       <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>
     114      <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>
    120115      <PreprocessorDefinitions>CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    121116      <PrecompiledHeader>
  • stable/2.8/Cbc/MSVisualStudio/v10/libOsiCbc/libOsiCbc.vcxproj

    r1873 r1902  
    3030  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3131    <ConfigurationType>StaticLibrary</ConfigurationType>
    32     <PlatformToolset>v90</PlatformToolset>
    3332  </PropertyGroup>
    3433  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     
    8382      <PrecompiledHeader>
    8483      </PrecompiledHeader>
    85       <WarningLevel>Level3</WarningLevel>
    86       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    8784    </ClCompile>
    8885  </ItemDefinitionGroup>
  • stable/2.8/Cbc/MSVisualStudio/v9/Cbc.sln

    r1549 r1902  
    11Microsoft Visual Studio Solution File, Format Version 10.00
    2 # Visual Studio 2008
     2# Visual C++ Express 2008
    33Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cbcExamplesSample2", "cbcExamplesSample2\cbcExamplesSample2.vcproj", "{4C0B8243-2876-4C92-B6CB-2472B0571CC3}"
    44        ProjectSection(ProjectDependencies) = postProject
     
    7878                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|Win32.ActiveCfg = Debug|Win32
    7979                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|Win32.Build.0 = Debug|Win32
    80                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|x64.ActiveCfg = Debug|x64
    81                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|x64.Build.0 = Debug|x64
     80                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Debug|x64.ActiveCfg = Debug|Win32
    8281                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|Win32.ActiveCfg = Release|Win32
    8382                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|Win32.Build.0 = Release|Win32
    84                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|x64.ActiveCfg = Release|x64
    85                 {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|x64.Build.0 = Release|x64
     83                {4C0B8243-2876-4C92-B6CB-2472B0571CC3}.Release|x64.ActiveCfg = Release|Win32
    8684                {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|Win32.ActiveCfg = Debug|Win32
    8785                {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|Win32.Build.0 = Debug|Win32
    88                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|x64.ActiveCfg = Debug|x64
    89                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|x64.Build.0 = Debug|x64
     86                {E2294708-C5BA-460A-B0A7-060A4023684A}.Debug|x64.ActiveCfg = Debug|Win32
    9087                {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|Win32.ActiveCfg = Release|Win32
    9188                {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|Win32.Build.0 = Release|Win32
    92                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|x64.ActiveCfg = Release|x64
    93                 {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|x64.Build.0 = Release|x64
     89                {E2294708-C5BA-460A-B0A7-060A4023684A}.Release|x64.ActiveCfg = Release|Win32
    9490                {363BA154-FEC9-4E1E-BC23-93CEC58AB785}.Debug|Win32.ActiveCfg = Debug|Win32
    9591                {363BA154-FEC9-4E1E-BC23-93CEC58AB785}.Debug|Win32.Build.0 = Debug|Win32
     
    144140                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|Win32.ActiveCfg = Debug|Win32
    145141                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|Win32.Build.0 = Debug|Win32
    146                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|x64.ActiveCfg = Debug|x64
    147                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|x64.Build.0 = Debug|x64
     142                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Debug|x64.ActiveCfg = Debug|Win32
    148143                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|Win32.ActiveCfg = Release|Win32
    149144                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|Win32.Build.0 = Release|Win32
    150                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|x64.ActiveCfg = Release|x64
    151                 {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|x64.Build.0 = Release|x64
     145                {71DA4595-E8A7-4B21-A00A-D96D29D11E3E}.Release|x64.ActiveCfg = Release|Win32
    152146                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|Win32.ActiveCfg = Debug|Win32
    153147                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|Win32.Build.0 = Debug|Win32
  • stable/2.8/Cbc/MSVisualStudio/v9/cbc/cbc.vcproj

    r1753 r1902  
    4343                        <Tool
    4444                                Name="VCMIDLTool"
    45                                 TypeLibraryName=".\Debug/cbcSolve.tlb"
     45                                TypeLibraryName=".\Debug\cbcSolve.tlb"
    4646                                HeaderFileName=""
    4747                        />
     
    129129                        <Tool
    130130                                Name="VCMIDLTool"
    131                                 TypeLibraryName=".\Release/cbcSolve.tlb"
     131                                TypeLibraryName=".\Release\cbcSolve.tlb"
    132132                                HeaderFileName=""
    133133                        />
     
    216216                                Name="VCMIDLTool"
    217217                                TargetEnvironment="3"
    218                                 TypeLibraryName=".\Debug/cbcSolve.tlb"
     218                                TypeLibraryName=".\Debug\cbcSolve.tlb"
    219219                                HeaderFileName=""
    220220                        />
     
    303303                                Name="VCMIDLTool"
    304304                                TargetEnvironment="3"
    305                                 TypeLibraryName=".\Release/cbcSolve.tlb"
     305                                TypeLibraryName=".\Release\cbcSolve.tlb"
    306306                                HeaderFileName=""
    307307                        />
     
    429429        </Globals>
    430430</VisualStudioProject>
     431
  • stable/2.8/Cbc/MSVisualStudio/v9/cbcExamplesSample2/cbcExamplesSample2.vcproj

    r1584 r1902  
    4343                        <Tool
    4444                                Name="VCMIDLTool"
    45                                 TypeLibraryName=".\Debug/cbcExamplesSample2.tlb"
     45                                TypeLibraryName=".\Debug\cbcExamplesSample2.tlb"
    4646                                HeaderFileName=""
    4747                        />
     
    4949                                Name="VCCLCompilerTool"
    5050                                Optimization="0"
    51                                 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;."
     51                                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;."
    5252                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;"
    5353                                BasicRuntimeChecks="3"
     
    5555                                RuntimeTypeInfo="true"
    5656                                UsePrecompiledHeader="0"
    57                                 PrecompiledHeaderFile=".\Debug/cbcExamplesSample2.pch"
    58                                 AssemblerListingLocation=".\Debug/"
    59                                 ObjectFile=".\Debug/"
    60                                 ProgramDataBaseFileName=".\Debug/"
     57                                PrecompiledHeaderFile=".\Debug\cbcExamplesSample2.pch"
     58                                AssemblerListingLocation=".\Debug\"
     59                                ObjectFile=".\Debug\"
     60                                ProgramDataBaseFileName=".\Debug\"
    6161                                WarningLevel="3"
    6262                                SuppressStartupBanner="true"
     
    8383                                AdditionalLibraryDirectories="$(OutDir)"
    8484                                GenerateDebugInformation="true"
    85                                 ProgramDatabaseFile=".\Debug/cbcExamplesSample2.pdb"
     85                                ProgramDatabaseFile=".\Debug\cbcExamplesSample2.pdb"
     86                                SubSystem="1"
     87                                RandomizedBaseAddress="1"
     88                                DataExecutionPrevention="0"
     89                                TargetMachine="1"
     90                        />
     91                        <Tool
     92                                Name="VCALinkTool"
     93                        />
     94                        <Tool
     95                                Name="VCManifestTool"
     96                        />
     97                        <Tool
     98                                Name="VCXDCMakeTool"
     99                        />
     100                        <Tool
     101                                Name="VCBscMakeTool"
     102                        />
     103                        <Tool
     104                                Name="VCFxCopTool"
     105                        />
     106                        <Tool
     107                                Name="VCAppVerifierTool"
     108                        />
     109                        <Tool
     110                                Name="VCPostBuildEventTool"
     111                        />
     112                </Configuration>
     113                <Configuration
     114                        Name="Release|Win32"
     115                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
     116                        IntermediateDirectory="$(ConfigurationName)"
     117                        ConfigurationType="1"
     118                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
     119                        UseOfMFC="0"
     120                        ATLMinimizesCRunTimeLibraryUsage="false"
     121                        CharacterSet="2"
     122                        >
     123                        <Tool
     124                                Name="VCPreBuildEventTool"
     125                        />
     126                        <Tool
     127                                Name="VCCustomBuildTool"
     128                        />
     129                        <Tool
     130                                Name="VCXMLDataGeneratorTool"
     131                        />
     132                        <Tool
     133                                Name="VCWebServiceProxyGeneratorTool"
     134                        />
     135                        <Tool
     136                                Name="VCMIDLTool"
     137                                TypeLibraryName=".\Release\cbcExamplesSample2.tlb"
     138                                HeaderFileName=""
     139                        />
     140                        <Tool
     141                                Name="VCCLCompilerTool"
     142                                Optimization="2"
     143                                InlineFunctionExpansion="1"
     144                                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;."
     145                                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;"
     146                                StringPooling="true"
     147                                RuntimeLibrary="2"
     148                                EnableFunctionLevelLinking="true"
     149                                RuntimeTypeInfo="true"
     150                                UsePrecompiledHeader="0"
     151                                PrecompiledHeaderFile=".\Release\cbcExamplesSample2.pch"
     152                                AssemblerListingLocation=".\Release\"
     153                                ObjectFile=".\Release\"
     154                                ProgramDataBaseFileName=".\Release\"
     155                                WarningLevel="3"
     156                                SuppressStartupBanner="true"
     157                                CompileAs="0"
     158                        />
     159                        <Tool
     160                                Name="VCManagedResourceCompilerTool"
     161                        />
     162                        <Tool
     163                                Name="VCResourceCompilerTool"
     164                                PreprocessorDefinitions="NDEBUG;_NDEBUG"
     165                                Culture="1033"
     166                        />
     167                        <Tool
     168                                Name="VCPreLinkEventTool"
     169                        />
     170                        <Tool
     171                                Name="VCLinkerTool"
     172                                AdditionalDependencies="libOsiClp.lib"
     173                                OutputFile="$(OutDir)\$(ProjectName).exe"
     174                                LinkIncremental="1"
     175                                SuppressStartupBanner="true"
     176                                AdditionalLibraryDirectories="$(OutDir)"
     177                                ProgramDatabaseFile=".\Release\cbcExamplesSample2.pdb"
    86178                                SubSystem="1"
    87179                                RandomizedBaseAddress="1"
     
    136228                                Name="VCMIDLTool"
    137229                                TargetEnvironment="3"
    138                                 TypeLibraryName=".\Debug/cbcExamplesSample2.tlb"
     230                                TypeLibraryName=".\Debug\cbcExamplesSample2.tlb"
    139231                                HeaderFileName=""
    140232                        />
     
    142234                                Name="VCCLCompilerTool"
    143235                                Optimization="0"
    144                                 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;."
     236                                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;."
    145237                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;"
    146238                                BasicRuntimeChecks="3"
     
    148240                                RuntimeTypeInfo="true"
    149241                                UsePrecompiledHeader="0"
    150                                 PrecompiledHeaderFile=".\Debug/cbcExamplesSample2.pch"
    151                                 AssemblerListingLocation=".\Debug/"
    152                                 ObjectFile=".\Debug/"
    153                                 ProgramDataBaseFileName=".\Debug/"
     242                                PrecompiledHeaderFile=".\Debug\cbcExamplesSample2.pch"
     243                                AssemblerListingLocation=".\Debug\"
     244                                ObjectFile=".\Debug\"
     245                                ProgramDataBaseFileName=".\Debug\"
    154246                                WarningLevel="3"
    155247                                SuppressStartupBanner="true"
     
    176268                                AdditionalLibraryDirectories="$(OutDir)"
    177269                                GenerateDebugInformation="true"
    178                                 ProgramDatabaseFile=".\Debug/cbcExamplesSample2.pdb"
     270                                ProgramDatabaseFile=".\Debug\cbcExamplesSample2.pdb"
    179271                                SubSystem="1"
    180272                                RandomizedBaseAddress="1"
    181273                                DataExecutionPrevention="0"
    182274                                TargetMachine="17"
    183                         />
    184                         <Tool
    185                                 Name="VCALinkTool"
    186                         />
    187                         <Tool
    188                                 Name="VCManifestTool"
    189                         />
    190                         <Tool
    191                                 Name="VCXDCMakeTool"
    192                         />
    193                         <Tool
    194                                 Name="VCBscMakeTool"
    195                         />
    196                         <Tool
    197                                 Name="VCFxCopTool"
    198                         />
    199                         <Tool
    200                                 Name="VCAppVerifierTool"
    201                         />
    202                         <Tool
    203                                 Name="VCPostBuildEventTool"
    204                         />
    205                 </Configuration>
    206                 <Configuration
    207                         Name="Release|Win32"
    208                         OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    209                         IntermediateDirectory="$(ConfigurationName)"
    210                         ConfigurationType="1"
    211                         InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
    212                         UseOfMFC="0"
    213                         ATLMinimizesCRunTimeLibraryUsage="false"
    214                         CharacterSet="2"
    215                         >
    216                         <Tool
    217                                 Name="VCPreBuildEventTool"
    218                         />
    219                         <Tool
    220                                 Name="VCCustomBuildTool"
    221                         />
    222                         <Tool
    223                                 Name="VCXMLDataGeneratorTool"
    224                         />
    225                         <Tool
    226                                 Name="VCWebServiceProxyGeneratorTool"
    227                         />
    228                         <Tool
    229                                 Name="VCMIDLTool"
    230                                 TypeLibraryName=".\Release/cbcExamplesSample2.tlb"
    231                                 HeaderFileName=""
    232                         />
    233                         <Tool
    234                                 Name="VCCLCompilerTool"
    235                                 Optimization="2"
    236                                 InlineFunctionExpansion="1"
    237                                 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;."
    238                                 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;"
    239                                 StringPooling="true"
    240                                 RuntimeLibrary="2"
    241                                 EnableFunctionLevelLinking="true"
    242                                 RuntimeTypeInfo="true"
    243                                 UsePrecompiledHeader="0"
    244                                 PrecompiledHeaderFile=".\Release/cbcExamplesSample2.pch"
    245                                 AssemblerListingLocation=".\Release/"
    246                                 ObjectFile=".\Release/"
    247                                 ProgramDataBaseFileName=".\Release/"
    248                                 WarningLevel="3"
    249                                 SuppressStartupBanner="true"
    250                                 CompileAs="0"
    251                         />
    252                         <Tool
    253                                 Name="VCManagedResourceCompilerTool"
    254                         />
    255                         <Tool
    256                                 Name="VCResourceCompilerTool"
    257                                 PreprocessorDefinitions="NDEBUG;_NDEBUG"
    258                                 Culture="1033"
    259                         />
    260                         <Tool
    261                                 Name="VCPreLinkEventTool"
    262                         />
    263                         <Tool
    264                                 Name="VCLinkerTool"
    265                                 AdditionalDependencies="libOsiClp.lib"
    266                                 OutputFile="$(OutDir)\$(ProjectName).exe"
    267                                 LinkIncremental="1"
    268                                 SuppressStartupBanner="true"
    269                                 AdditionalLibraryDirectories="$(OutDir)"
    270                                 ProgramDatabaseFile=".\Release/cbcExamplesSample2.pdb"
    271                                 SubSystem="1"
    272                                 RandomizedBaseAddress="1"
    273                                 DataExecutionPrevention="0"
    274                                 TargetMachine="1"
    275275                        />
    276276                        <Tool
     
    321321                                Name="VCMIDLTool"
    322322                                TargetEnvironment="3"
    323                                 TypeLibraryName=".\Release/cbcExamplesSample2.tlb"
     323                                TypeLibraryName=".\Release\cbcExamplesSample2.tlb"
    324324                                HeaderFileName=""
    325325                        />
     
    328328                                Optimization="2"
    329329                                InlineFunctionExpansion="1"
    330                                 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;."
     330                                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;."
    331331                                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;"
    332332                                StringPooling="true"
     
    335335                                RuntimeTypeInfo="true"
    336336                                UsePrecompiledHeader="0"
    337                                 PrecompiledHeaderFile=".\Release/cbcExamplesSample2.pch"
    338                                 AssemblerListingLocation=".\Release/"
    339                                 ObjectFile=".\Release/"
    340                                 ProgramDataBaseFileName=".\Release/"
     337                                PrecompiledHeaderFile=".\Release\cbcExamplesSample2.pch"
     338                                AssemblerListingLocation=".\Release\"
     339                                ObjectFile=".\Release\"
     340                                ProgramDataBaseFileName=".\Release\"
    341341                                WarningLevel="3"
    342342                                SuppressStartupBanner="true"
     
    361361                                SuppressStartupBanner="true"
    362362                                AdditionalLibraryDirectories="$(OutDir)"
    363                                 ProgramDatabaseFile=".\Release/cbcExamplesSample2.pdb"
     363                                ProgramDatabaseFile=".\Release\cbcExamplesSample2.pdb"
    364364                                SubSystem="1"
    365365                                RandomizedBaseAddress="1"
     
    390390                </Configuration>
    391391        </Configurations>
     392        <References>
     393        </References>
    392394        <Files>
    393395                <Filter
     
    412414                                </FileConfiguration>
    413415                                <FileConfiguration
     416                                        Name="Release|Win32"
     417                                        >
     418                                        <Tool
     419                                                Name="VCCLCompilerTool"
     420                                                Optimization="2"
     421                                                AdditionalIncludeDirectories=""
     422                                                PreprocessorDefinitions=""
     423                                                ObjectFile="$(IntDir)\"
     424                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
     425                                        />
     426                                </FileConfiguration>
     427                                <FileConfiguration
    414428                                        Name="Debug|x64"
    415429                                        >
     
    425439                                </FileConfiguration>
    426440                                <FileConfiguration
     441                                        Name="Release|x64"
     442                                        >
     443                                        <Tool
     444                                                Name="VCCLCompilerTool"
     445                                                Optimization="2"
     446                                                AdditionalIncludeDirectories=""
     447                                                PreprocessorDefinitions=""
     448                                                ObjectFile="$(IntDir)\"
     449                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
     450                                        />
     451                                </FileConfiguration>
     452                        </File>
     453                        <File
     454                                RelativePath="..\..\..\..\Cbc\examples\CbcCompareUser.cpp"
     455                                >
     456                                <FileConfiguration
     457                                        Name="Debug|Win32"
     458                                        >
     459                                        <Tool
     460                                                Name="VCCLCompilerTool"
     461                                                Optimization="0"
     462                                                AdditionalIncludeDirectories=""
     463                                                PreprocessorDefinitions=""
     464                                                BasicRuntimeChecks="3"
     465                                                ObjectFile="$(IntDir)\"
     466                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
     467                                        />
     468                                </FileConfiguration>
     469                                <FileConfiguration
    427470                                        Name="Release|Win32"
    428471                                        >
     
    437480                                </FileConfiguration>
    438481                                <FileConfiguration
     482                                        Name="Debug|x64"
     483                                        >
     484                                        <Tool
     485                                                Name="VCCLCompilerTool"
     486                                                Optimization="0"
     487                                                AdditionalIncludeDirectories=""
     488                                                PreprocessorDefinitions=""
     489                                                BasicRuntimeChecks="3"
     490                                                ObjectFile="$(IntDir)\"
     491                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
     492                                        />
     493                                </FileConfiguration>
     494                                <FileConfiguration
    439495                                        Name="Release|x64"
    440496                                        >
     
    450506                        </File>
    451507                        <File
    452                                 RelativePath="..\..\..\src\CbcCbcParam.cpp"
    453                                 >
    454                         </File>
    455                         <File
    456                                 RelativePath="..\..\..\..\Cbc\examples\CbcCompareUser.cpp"
     508                                RelativePath="..\..\..\..\Cbc\examples\sample2.cpp"
    457509                                >
    458510                                <FileConfiguration
     
    470522                                </FileConfiguration>
    471523                                <FileConfiguration
     524                                        Name="Release|Win32"
     525                                        >
     526                                        <Tool
     527                                                Name="VCCLCompilerTool"
     528                                                Optimization="2"
     529                                                AdditionalIncludeDirectories=""
     530                                                PreprocessorDefinitions=""
     531                                                ObjectFile="$(IntDir)\"
     532                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
     533                                        />
     534                                </FileConfiguration>
     535                                <FileConfiguration
    472536                                        Name="Debug|x64"
    473537                                        >
     
    478542                                                PreprocessorDefinitions=""
    479543                                                BasicRuntimeChecks="3"
    480                                                 ObjectFile="$(IntDir)\"
    481                                                 ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
    482                                         />
    483                                 </FileConfiguration>
    484                                 <FileConfiguration
    485                                         Name="Release|Win32"
    486                                         >
    487                                         <Tool
    488                                                 Name="VCCLCompilerTool"
    489                                                 Optimization="2"
    490                                                 AdditionalIncludeDirectories=""
    491                                                 PreprocessorDefinitions=""
    492                                                 ObjectFile="$(IntDir)\"
    493                                                 ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
    494                                         />
    495                                 </FileConfiguration>
    496                                 <FileConfiguration
    497                                         Name="Release|x64"
    498                                         >
    499                                         <Tool
    500                                                 Name="VCCLCompilerTool"
    501                                                 Optimization="2"
    502                                                 AdditionalIncludeDirectories=""
    503                                                 PreprocessorDefinitions=""
    504                                                 ObjectFile="$(IntDir)\"
    505                                                 ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
    506                                         />
    507                                 </FileConfiguration>
    508                         </File>
    509                         <File
    510                                 RelativePath="..\..\..\src\CbcLinked.cpp"
    511                                 >
    512                         </File>
    513                         <File
    514                                 RelativePath="..\..\..\src\CbcLinkedUtils.cpp"
    515                                 >
    516                         </File>
    517                         <File
    518                                 RelativePath="..\..\..\src\CbcSolver.cpp"
    519                                 >
    520                         </File>
    521                         <File
    522                                 RelativePath="..\..\..\src\CbcSolver.cpp"
    523                                 >
    524                         </File>
    525                         <File
    526                                 RelativePath="..\..\..\src\CbcSolverAnalyze.cpp"
    527                                 >
    528                         </File>
    529                         <File
    530                                 RelativePath="..\..\..\src\CbcSolverExpandKnapsack.cpp"
    531                                 >
    532                         </File>
    533                         <File
    534                                 RelativePath="..\..\..\src\CbcSolverHeuristics.cpp"
    535                                 >
    536                         </File>
    537                         <File
    538                                 RelativePath="..\..\..\..\Cbc\examples\sample2.cpp"
    539                                 >
    540                                 <FileConfiguration
    541                                         Name="Debug|Win32"
    542                                         >
    543                                         <Tool
    544                                                 Name="VCCLCompilerTool"
    545                                                 Optimization="0"
    546                                                 AdditionalIncludeDirectories=""
    547                                                 PreprocessorDefinitions=""
    548                                                 BasicRuntimeChecks="3"
    549                                                 ObjectFile="$(IntDir)\"
    550                                                 ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
    551                                         />
    552                                 </FileConfiguration>
    553                                 <FileConfiguration
    554                                         Name="Debug|x64"
    555                                         >
    556                                         <Tool
    557                                                 Name="VCCLCompilerTool"
    558                                                 Optimization="0"
    559                                                 AdditionalIncludeDirectories=""
    560                                                 PreprocessorDefinitions=""
    561                                                 BasicRuntimeChecks="3"
    562                                                 ObjectFile="$(IntDir)\"
    563                                                 ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
    564                                         />
    565                                 </FileConfiguration>
    566                                 <FileConfiguration
    567                                         Name="Release|Win32"
    568                                         >
    569                                         <Tool
    570                                                 Name="VCCLCompilerTool"
    571                                                 Optimization="2"
    572                                                 AdditionalIncludeDirectories=""
    573                                                 PreprocessorDefinitions=""
    574544                                                ObjectFile="$(IntDir)\"
    575545                                                ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
     
    683653                        </File>
    684654                        <File
     655                                RelativePath="..\..\..\..\Cgl\src\CglRedSplit2\CglRedSplit2.hpp"
     656                                >
     657                        </File>
     658                        <File
    685659                                RelativePath="..\..\..\..\Clp\src\ClpConfig.h"
    686660                                >
     
    831805        </Globals>
    832806</VisualStudioProject>
     807
  • stable/2.8/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj

    r1755 r1902  
    4646                                Name="VCCLCompilerTool"
    4747                                Optimization="0"
    48                                 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"
     48                                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"
    4949                                PreprocessorDefinitions="CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
    5050                                RuntimeLibrary="3"
     
    107107                        <Tool
    108108                                Name="VCCLCompilerTool"
    109                                 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"
     109                                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"
    110110                                PreprocessorDefinitions="CBC_BUILD;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
    111111                                RuntimeLibrary="2"
     
    169169                                Name="VCCLCompilerTool"
    170170                                Optimization="0"
    171                                 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"
     171                                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"
    172172                                PreprocessorDefinitions="CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
    173173                                RuntimeLibrary="3"
     
    231231                        <Tool
    232232                                Name="VCCLCompilerTool"
    233                                 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"
     233                                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"
    234234                                PreprocessorDefinitions="CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS"
    235235                                RuntimeLibrary="2"
     
    303303                        </File>
    304304                        <File
     305                                RelativePath="..\..\..\src\CbcMipStartIO.cpp"
     306                                >
     307                        </File>
     308                        <File
    305309                                RelativePath="..\..\..\src\CbcSolver.cpp"
    306310                                >
     
    333337                        </File>
    334338                        <File
     339                                RelativePath="..\..\..\src\CbcMipStartIO.hpp"
     340                                >
     341                        </File>
     342                        <File
    335343                                RelativePath="..\..\..\src\CbcSolver.hpp"
    336344                                >
     
    359367        </Globals>
    360368</VisualStudioProject>
     369
  • stable/2.8/Cbc/README

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

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/configure.ac

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/examples/CbcBranchFollow2.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    106#include <cassert>
    117#include <cmath>
     
    139//#define CBC_DEBUG
    1410
     11#include "CoinPragma.hpp"
    1512#include "OsiSolverInterface.hpp"
    1613#include "CbcModel.hpp"
  • stable/2.8/Cbc/examples/CbcBranchLink.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    106#include <cassert>
    117#include <cmath>
     
    139//#define CBC_DEBUG
    1410
     11#include "CoinPragma.hpp"
    1512#include "OsiSolverInterface.hpp"
    1613#include "CbcModel.hpp"
     
    5249    // weights must be increasing
    5350    int i;
    54     double last=-COIN_DBL_MAX;
    55     for (i=0;i<numberMembers_;i++) {
    56       assert (weights_[i]>last+1.0e-12);
    57       last=weights_[i];
    58     }
     51    for (i=0;i<numberMembers_;i++)
     52      assert (i == 0 || weights_[i]>weights_[i-1]+1.0e-12);
    5953    for (i=0;i<numberMembers_*numberLinks_;i++) {
    6054      which_[i]=first+i;
     
    8680    // weights must be increasing
    8781    int i;
    88     double last=-COIN_DBL_MAX;
    89     for (i=0;i<numberMembers_;i++) {
    90       assert (weights_[i]>last+1.0e-12);
    91       last=weights_[i];
    92     }
     82    for (i=0;i<numberMembers_;i++)
     83      assert (i == 0 || weights_[i]>weights_[i-1]+1.0e-12);
    9384    for (i=0;i<numberMembers_*numberLinks_;i++) {
    9485      which_[i]= which[i];
     
    467458// Creates a branching object
    468459CbcBranchingObject *
    469 CbcLink::createBranch(int way)
     460CbcLink::createCbcBranch(OsiSolverInterface * /*solver*/, const OsiBranchingInformation * /*info*/, int way)
    470461{
    471462  int j;
  • stable/2.8/Cbc/examples/CbcBranchLink.hpp

    r1574 r1902  
    5858  virtual void feasibleRegion();
    5959  /// Creates a branching object
    60   virtual CbcBranchingObject * createBranch(int way) ;
     60  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver, const OsiBranchingInformation * info, int way) ;
    6161
    6262  /// Number of members
  • stable/2.8/Cbc/examples/CbcBranchUser.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    106#include <cassert>
    117#include <cmath>
    128#include <cfloat>
    139
     10#include "CoinPragma.hpp"
    1411#include "OsiSolverInterface.hpp"
    1512#include "CbcModel.hpp"
  • stable/2.8/Cbc/examples/CbcCompareUser.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    106#include <cassert>
    117#include <cmath>
     
    139//#define CBC_DEBUG
    1410
     11#include "CoinPragma.hpp"
    1512#include "CbcMessage.hpp"
    1613#include "CbcModel.hpp"
  • stable/2.8/Cbc/examples/CbcSolver3.cpp

    r1574 r1902  
    246246    assert(!modelPtr_->specialOptions());
    247247    int saveOptions = modelPtr_->specialOptions();
    248     int startFinishOptions;
    249248    bool takeHint;
    250249    OsiHintStrength strength;
    251     bool gotHint = (getHintParam(OsiDoInBranchAndCut,takeHint,strength));
    252     assert (gotHint);
     250    getHintParam(OsiDoInBranchAndCut,takeHint,strength);
    253251    if (strength!=OsiHintIgnore&&takeHint) {
    254252      // could do something - think about it
     
    256254    }
    257255    if((specialOptions_&1)==0) {
    258       startFinishOptions=0;
    259256      modelPtr_->setSpecialOptions(saveOptions|(64|1024));
    260257    } else {
    261       startFinishOptions=1+2+4;
    262258      if((specialOptions_&4)==0)
    263259        modelPtr_->setSpecialOptions(saveOptions|(64|128|512|1024|4096));
  • stable/2.8/Cbc/examples/CbcSolverLongThin.cpp

    r1793 r1902  
    473473    assert(!modelPtr_->specialOptions());
    474474    int saveOptions = modelPtr_->specialOptions();
    475     int startFinishOptions;
    476475    bool takeHint;
    477476    OsiHintStrength strength;
    478     bool gotHint = (getHintParam(OsiDoInBranchAndCut,takeHint,strength));
    479     assert (gotHint);
     477    getHintParam(OsiDoInBranchAndCut,takeHint,strength);
    480478    if (strength!=OsiHintIgnore&&takeHint) {
    481479      // could do something - think about it
     
    483481    }
    484482    if((specialOptions_&1)==0) {
    485       startFinishOptions=0;
    486483      modelPtr_->setSpecialOptions(saveOptions|(64|1024));
    487484    } else {
    488       startFinishOptions=1+2+4;
    489485      if((specialOptions_&4)==0)
    490486        modelPtr_->setSpecialOptions(saveOptions|(64|128|512|1024|4096));
  • stable/2.8/Cbc/examples/Makefile.in

    r1854 r1902  
    2121OBJS =  $(DRIVER).@OBJEXT@
    2222
    23 #       CbcCompareUser.@OBJEXT@ \
    24 #       CbcSolver2.@OBJEXT@ \
    25 #       CbcSolver3.@OBJEXT@ \
    26 #       ClpQuadInterface.@OBJEXT@ \
    27 #       CbcBranchFollow2.@OBJEXT@ \
    28 #       CbcBranchUser.@OBJEXT@ \
    29 #       CbcBranchLink.@OBJEXT@
     23# extra object files that are required by some examples (we just link them into each one)
     24EXTRAOBJS = \
     25        CbcCompareUser.@OBJEXT@ \
     26        CbcSolver2.@OBJEXT@ \
     27        CbcSolver3.@OBJEXT@ \
     28        CbcSolverLongThin.@OBJEXT@ \
     29        ClpQuadInterface.@OBJEXT@ \
     30        CbcBranchFollow2.@OBJEXT@ \
     31        CbcBranchUser.@OBJEXT@ \
     32        CbcBranchLink.@OBJEXT@
    3033
    3134# CHANGEME: Additional libraries
     35# e.g., for driver2, put -lOsiCbc here
    3236ADDLIBS =
    3337
     
    8993  INCL = @CBCLIB_CFLAGS_INSTALLED@
    9094endif
    91 INCL += $(ADDINCFLAGS)
     95INCL += -I@srcdir@ $(ADDINCFLAGS)
    9296
    9397# Linker flags
     
    106110
    107111# Here we list all possible generated objects or executables to delete them
    108 CLEANFILES = \
     112CLEANFILES = $(EXTRAOBJS) \
     113        allCuts.@OBJEXT@ allCuts@EXEEXT@ \
     114        barrier.@OBJEXT@ barrier@EXEEXT@ \
     115        cbc_driverC_sos.@OBJEXT@ cbc_driverC_sos@EXEEXT@ \
    109116        crew.@OBJEXT@ crew@EXEEXT@ \
    110         barrier.@OBJEXT@ barrier@EXEEXT@ \
     117        driver.@OBJEXT@ driver@EXEEXT@ \
    111118        driver2.@OBJEXT@ driver2@EXEEXT@ \
    112         driver.@OBJEXT@ driver@EXEEXT@ \
    113         dynamic.@OBJEXT@ dynamic@EXEEXT@ \
     119        driver3.@OBJEXT@ driver3@EXEEXT@ \
     120        driver4.@OBJEXT@ driver4@EXEEXT@ \
    114121        fast0507b.@OBJEXT@ fast0507b@EXEEXT@ \
    115122        fast0507.@OBJEXT@ fast0507@EXEEXT@ \
    116123        gear.@OBJEXT@ gear@EXEEXT@ \
    117124        hotstart.@OBJEXT@ hotstart@EXEEXT@ \
     125        interrupt.@OBJEXT@ interrupt@EXEEXT@ \
    118126        link.@OBJEXT@ link@EXEEXT@ \
    119127        longthin.@OBJEXT@ longthin@EXEEXT@ \
    120128        lotsize.@OBJEXT@ lotsize@EXEEXT@ \
    121129        minimum.@OBJEXT@ minimum@EXEEXT@ \
     130        modify.@OBJEXT@ modify@EXEEXT@ \
    122131        nway.@OBJEXT@ nway@EXEEXT@ \
    123132        qmip.@OBJEXT@ qmip@EXEEXT@ \
     
    129138        sample4.@OBJEXT@ sample4@EXEEXT@ \
    130139        sample5.@OBJEXT@ sample5@EXEEXT@ \
     140        simpleBAB.@OBJEXT@ simpleBAB@EXEEXT@ \
    131141        sos.@OBJEXT@ sos@EXEEXT@ \
    132142        sudoku.@OBJEXT@ sudoku@EXEEXT@
     
    136146.SUFFIXES: .cpp .c .o .obj
    137147
    138 $(EXE): $(OBJS)
     148$(EXE): $(OBJS) $(EXTRAOBJS)
    139149        bla=;\
    140         for file in $(OBJS); do bla="$$bla `$(CYGPATH_W) $$file`"; done; \
     150        for file in $(OBJS) $(EXTRAOBJS); do bla="$$bla `$(CYGPATH_W) $$file`"; done; \
    141151        $(CXX) $(CXXLINKFLAGS) $(CXXFLAGS) -o $@ $$bla $(LIBS) $(ADDLIBS)
    142152
  • stable/2.8/Cbc/examples/allCuts.cpp

    r1854 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511// For Branch and bound
    1612#include "OsiSolverInterface.hpp"
     
    4238#include "CbcHeuristic.hpp"
    4339
    44 #include  "CoinTime.hpp"
     40#include "CoinTime.hpp"
    4541// Need stored cuts
    4642
     
    254250  if (argc>=2) mpsFileName = argv[1];
    255251  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    256   assert(numMpsReadErrors==0);
     252  if( numMpsReadErrors != 0 )
     253  {
     254     printf("%d errors reading MPS file\n", numMpsReadErrors);
     255     return numMpsReadErrors;
     256  }
    257257  double time1 = CoinCpuTime();
    258258  OsiClpSolverInterface solverSave = solver1;
  • stable/2.8/Cbc/examples/barrier.cpp

    r1854 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511#include "OsiClpSolverInterface.hpp"
    16 #include  "CoinTime.hpp"
     12#include "CoinTime.hpp"
    1713
    1814//#############################################################################
     
    7268  if (argc>=2) mpsFileName = argv[1];
    7369  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    74   assert(numMpsReadErrors==0);
     70  if( numMpsReadErrors != 0 )
     71  {
     72     printf("%d errors reading MPS file\n", numMpsReadErrors);
     73     return numMpsReadErrors;
     74  }
    7575  double time1 = CoinCpuTime();
    7676
  • stable/2.8/Cbc/examples/cbc_driverC_sos.c

    r1854 r1902  
    44  This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6   $Id#
     6  $Id$
    77*/
    88
     
    7777#if defined(SAMPLEDIR)
    7878  /*
    79     SAMPLEDIR should be something like "path/to/mps/directory/", including the
    80     quotes and final directory separator. Don't forget to properly escape
     79    SAMPLEDIR should be something like "path/to/mps/directory", including the
     80    quotes and excluding the final directory separator. Don't forget to properly escape
    8181    '\' when using native Windows path syntax.
    8282  */
    83     status=Cbc_readMps(model,SAMPLEDIR "p0033.mps") ;
     83    status=Cbc_readMps(model, SAMPLEDIR "/p0033.mps") ;
    8484#else
    8585    fprintf(stderr, "Please specify the full path to an MPS file on the command line\n");
     
    397397      } else {
    398398        int numObjects = numberSets; /* cannot pass const int */
    399         Cbc_addSOS_Dense(model, numObjects, len, (const int**)which, (const double*)weights, 2);
     399        Cbc_addSOS_Dense(model, numObjects, len, (const int* const *)which, (const double*)weights, 2);
    400400      }
    401401    }
  • stable/2.8/Cbc/examples/crew.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    14 
     9#include "CoinPragma.hpp"
    1510// For Branch and bound
    1611#include "OsiClpSolverInterface.hpp"
     
    1914#include "CbcCompareUser.hpp"
    2015
    21 #include  "CoinTime.hpp"
     16#include "CoinTime.hpp"
    2217
    2318/************************************************************************
     
    4944  if (argc>=2) mpsFileName = argv[1];
    5045  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    51   assert(numMpsReadErrors==0);
     46  if( numMpsReadErrors != 0 )
     47  {
     48     printf("%d errors reading MPS file\n", numMpsReadErrors);
     49     return numMpsReadErrors;
     50  }
    5251  double time1 = CoinCpuTime();
    5352
     
    6059  // Point to solver
    6160  OsiSolverInterface * solver3 = model.solver();
    62   OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver3);
    63   assert (osiclp);
     61  assert (dynamic_cast< OsiClpSolverInterface*> (solver3));
    6462
    6563  // Definition of node choice
  • stable/2.8/Cbc/examples/driver.cpp

    r1574 r1902  
    33// Corporation and others.  All Rights Reserved.
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    5 
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    105
    116#include <cassert>
     
    149
    1510// For Branch and bound
     11#include "CoinPragma.hpp"
    1612#include "CbcModel.hpp"
    1713#include "CbcStrategy.hpp"
     
    2016#include "CglPreProcess.hpp"
    2117
    22 #include  "CoinTime.hpp"
     18#include "CoinTime.hpp"
    2319
    2420//#############################################################################
     
    5046  if (argc>=2) mpsFileName = argv[1];
    5147  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    52   assert(numMpsReadErrors==0);
     48  if( numMpsReadErrors != 0 )
     49  {
     50     printf("%d errors reading MPS file\n", numMpsReadErrors);
     51     return numMpsReadErrors;
     52  }
    5353  double time1 = CoinCpuTime();
    5454
  • stable/2.8/Cbc/examples/driver2.cpp

    r1574 r1902  
    33// Corporation and others.  All Rights Reserved.
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    5 
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    105
    116#include <cassert>
     
    1510// For Branch and bound
    1611//#include "CbcStrategy.hpp"
     12#include "CoinPragma.hpp"
    1713#include "OsiCbcSolverInterface.hpp"
    1814
    19 #include  "CoinTime.hpp"
     15#include "CoinTime.hpp"
    2016
    2117//#############################################################################
     
    5046  if (argc>=2) mpsFileName = argv[1];
    5147  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    52   assert(numMpsReadErrors==0);
     48  if( numMpsReadErrors != 0 )
     49  {
     50     printf("%d errors reading MPS file\n", numMpsReadErrors);
     51     return numMpsReadErrors;
     52  }
    5353  double time1 = CoinCpuTime();
    5454  // Do complete search
  • stable/2.8/Cbc/examples/driver3.cpp

    r1854 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9#include "CoinPragma.hpp"
    1410#include "CbcModel.hpp"
    1511#include "OsiClpSolverInterface.hpp"
    1612#include "CbcBranchDynamic.hpp"
    1713
    18 #include  "CoinTime.hpp"
     14#include "CoinTime.hpp"
    1915
    2016//#############################################################################
     
    5551  if (argc>=2) mpsFileName = argv[1];
    5652  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    57   assert(numMpsReadErrors==0);
     53  if( numMpsReadErrors != 0 )
     54  {
     55     printf("%d errors reading MPS file\n", numMpsReadErrors);
     56     return numMpsReadErrors;
     57  }
    5858
    5959  // Strip off integer information and save
  • stable/2.8/Cbc/examples/driver4.cpp

    r1854 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511#include "CbcModel.hpp"
    1612#include "OsiClpSolverInterface.hpp"
    1713#include "CbcSolver.hpp"
    1814
    19 #include  "CoinTime.hpp"
     15#include "CoinTime.hpp"
    2016
    2117//#############################################################################
     
    221217  if (argc>=2) mpsFileName = argv[1];
    222218  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    223   assert(numMpsReadErrors==0);
     219  if( numMpsReadErrors != 0 )
     220  {
     221     printf("%d errors reading MPS file\n", numMpsReadErrors);
     222     return numMpsReadErrors;
     223  }
    224224  // Tell solver to return fast if presolve or initial solve infeasible
    225225  solver1.getModelPtr()->setMoreSpecialOptions(3);
  • stable/2.8/Cbc/examples/fast0507.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9#include "CoinPragma.hpp"
    1410
    1511// For Branch and bound
     
    3935#include "CglPreProcess.hpp"
    4036
    41 #include  "CoinTime.hpp"
     37#include "CoinTime.hpp"
    4238
    4339//#############################################################################
     
    7773  if (argc>=2) mpsFileName = argv[1];
    7874  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    79   assert(numMpsReadErrors==0);
     75  if( numMpsReadErrors != 0 )
     76  {
     77     printf("%d errors reading MPS file\n", numMpsReadErrors);
     78     return numMpsReadErrors;
     79  }
    8080  double time1 = CoinCpuTime();
    8181
  • stable/2.8/Cbc/examples/fast0507b.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include "CbcConfig.h"
    127
     
    149#include <iomanip>
    1510
     11#include "CoinPragma.hpp"
    1612
    1713// For Branch and bound
     
    3935#include "CglPreProcess.hpp"
    4036
    41 #include  "CoinTime.hpp"
     37#include "CoinTime.hpp"
    4238
    4339//#############################################################################
     
    8379  if (argc>=2) mpsFileName = argv[1];
    8480  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    85   assert(numMpsReadErrors==0);
     81  if( numMpsReadErrors != 0 )
     82  {
     83     printf("%d errors reading MPS file\n", numMpsReadErrors);
     84     return numMpsReadErrors;
     85  }
    8686  double time1 = CoinCpuTime();
    8787  /* Options are:
  • stable/2.8/Cbc/examples/gear.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9#include "CoinPragma.hpp"
    1410
    1511// For Branch and bound
     
    2117#include "OsiClpSolverInterface.hpp"
    2218
    23 #include  "CoinTime.hpp"
     19#include "CoinTime.hpp"
    2420
    2521
  • stable/2.8/Cbc/examples/hotstart.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9#include "CoinPragma.hpp"
    1410
    1511// For Branch and bound
     
    3834#include "CbcHeuristic.hpp"
    3935
    40 #include  "CoinTime.hpp"
     36#include "CoinTime.hpp"
    4137
    4238//#############################################################################
     
    7470  if (argc>=2) mpsFileName = argv[1];
    7571  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    76   assert(numMpsReadErrors==0);
     72  if( numMpsReadErrors != 0 )
     73  {
     74     printf("%d errors reading MPS file\n", numMpsReadErrors);
     75     return numMpsReadErrors;
     76  }
    7777  double time1 = CoinCpuTime();
    7878
  • stable/2.8/Cbc/examples/interrupt.cpp

    • Property svn:keywords set to Author Date Id Revision
    r1873 r1902  
    1 // $Id: interrupt.cpp 1854 2013-01-28 00:02:55Z stefan $
     1// $Id$
    22// Copyright (C) 2007, International Business Machines
    33// Corporation and others.  All Rights Reserved.
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511#include "CbcModel.hpp"
    1612#include "OsiClpSolverInterface.hpp"
    1713#include "CbcSolver.hpp"
    1814
    19 #include  "CoinTime.hpp"
     15#include "CoinTime.hpp"
    2016
    2117//#############################################################################
     
    359355  if (argc>=2) mpsFileName = argv[1];
    360356  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    361   assert(numMpsReadErrors==0);
     357  if( numMpsReadErrors != 0 )
     358  {
     359     printf("%d errors reading MPS file\n", numMpsReadErrors);
     360     return numMpsReadErrors;
     361  }
    362362  // Tell solver to return fast if presolve or initial solve infeasible
    363363  solver1.getModelPtr()->setMoreSpecialOptions(3);
  • stable/2.8/Cbc/examples/link.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    14 
     9#include "CoinPragma.hpp"
    1510// For Branch and bound
    1611#include "OsiSolverInterface.hpp"
     
    2116#include "OsiClpSolverInterface.hpp"
    2217
    23 #include  "CoinTime.hpp"
     18#include "CoinTime.hpp"
    2419
    2520
  • stable/2.8/Cbc/examples/longthin.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511// For Branch and bound
    1612#include "OsiSolverInterface.hpp"
     
    2824#include "CglProbing.hpp"
    2925
    30 #include  "CoinTime.hpp"
     26#include "CoinTime.hpp"
    3127
    3228/************************************************************************
     
    5854  if (argc>=2) mpsFileName = argv[1];
    5955  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    60   assert(numMpsReadErrors==0);
     56  if( numMpsReadErrors != 0 )
     57  {
     58     printf("%d errors reading MPS file\n", numMpsReadErrors);
     59     return numMpsReadErrors;
     60  }
    6161  double time1 = CoinCpuTime();
    6262
  • stable/2.8/Cbc/examples/lotsize.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    14 
     9#include "CoinPragma.hpp"
    1510// For Branch and bound
    1611#include "CbcModel.hpp"
     
    5045  if (argc>=2) mpsFileName = argv[1];
    5146  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    52   assert(numMpsReadErrors==0);
     47  if( numMpsReadErrors != 0 )
     48  {
     49     printf("%d errors reading MPS file\n", numMpsReadErrors);
     50     return numMpsReadErrors;
     51  }
    5352 
    5453  int iColumn;
  • stable/2.8/Cbc/examples/minimum.cpp

    r1574 r1902  
    1616#if defined(SAMPLEDIR)
    1717  int numMpsReadErrors = solver1.readMps(SAMPLEDIR "/p0033.mps","");
    18   assert(numMpsReadErrors==0);
     18  if( numMpsReadErrors != 0 )
     19  {
     20     printf("%d errors reading MPS file\n", numMpsReadErrors);
     21     return numMpsReadErrors;
     22  }
    1923#else
    2024  fprintf(stderr, "Do not know where to find sample MPS files.\n");
  • stable/2.8/Cbc/examples/nway.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511// For Branch and bound
    1612#include "CbcModel.hpp"
     
    4945  if (argc>=2) mpsFileName = argv[1];
    5046  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    51   assert(numMpsReadErrors==0);
     47  if( numMpsReadErrors != 0 )
     48  {
     49     printf("%d errors reading MPS file\n", numMpsReadErrors);
     50     return numMpsReadErrors;
     51  }
    5252 
    5353  int iRow, iColumn;
  • stable/2.8/Cbc/examples/qmip.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9
     10#include "CoinPragma.hpp"
    1411
    1512// For Branch and bound
     
    6764
    6865  // Read in model using argv[1]
     66  if (argc <= 1) {
     67     printf("using %s <modelfile>\n", argv[0]);
     68     return 1;
     69  }
    6970  // must use clp to get a quadratic model
    7071  ClpSimplex * clp = solver1.getModelPtr();
    7172  int numMpsReadErrors = clp->readMps(argv[1]);
    7273  // and assert that it is a clean model
    73   assert(numMpsReadErrors==0);
     74  if( numMpsReadErrors != 0 )
     75  {
     76     printf("%d errors reading MPS file\n", numMpsReadErrors);
     77     return numMpsReadErrors;
     78  }
    7479
    7580  // This clones solver
  • stable/2.8/Cbc/examples/qmip2.cpp

    r1854 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
     7
     8#include "CoinPragma.hpp"
    129
    1310// For Branch and bound
  • stable/2.8/Cbc/examples/repeat.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9#include "CoinPragma.hpp"
    1410
    1511// For Branch and bound
     
    3935#include "CbcHeuristic.hpp"
    4036
    41 #include  "CoinTime.hpp"
     37#include "CoinTime.hpp"
    4238
    4339//#############################################################################
     
    7975  if (argc>=2) mpsFileName = argv[1];
    8076  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    81   assert(numMpsReadErrors==0);
     77  if( numMpsReadErrors != 0 )
     78  {
     79     printf("%d errors reading MPS file\n", numMpsReadErrors);
     80     return numMpsReadErrors;
     81  }
    8282  double time1 = CoinCpuTime();
    8383
     
    301301    OsiSolverInterface * refSolver = model.referenceSolver();
    302302    const double * bestSolution = model.bestSolution();
     303#ifndef NDEBUG
    303304    const double * originalLower = refSolver->getColLower();
    304305    const double * originalUpper = refSolver->getColUpper();
     306#endif
    305307    CoinPackedVector cut;
    306308    double rhs = 1.0;
  • stable/2.8/Cbc/examples/sample1.cpp

    r1660 r1902  
    4343  struct rusage usage;
    4444  getrusage(RUSAGE_SELF,&usage);
    45   cpu_temp = usage.ru_utime.tv_sec;
     45  cpu_temp = (double)usage.ru_utime.tv_sec;
    4646  cpu_temp += 1.0e-6*((double) usage.ru_utime.tv_usec);
    4747#endif
     
    8787  // and assert that it is a clean model
    8888
    89   assert(!simplex.readMps(argv[1],""));
     89  if (argc <= 1) {
     90     printf("using %s <modelfile>\n", argv[0]);
     91     return 1;
     92  }
     93  int numMpsReadErrors = simplex.readMps(argv[1],"");
     94  if( numMpsReadErrors != 0 )
     95  {
     96     printf("%d errors reading MPS file\n", numMpsReadErrors);
     97     return numMpsReadErrors;
     98  }
    9099  time2 = cpuTime();
    91100  std::cout<<"Input took "<<time2-time1<<" seconds"<<std::endl;;
  • stable/2.8/Cbc/examples/sample2.cpp

    r1660 r1902  
    3535#include "CbcHeuristic.hpp"
    3636
    37 #include  "CoinTime.hpp"
     37#include "CoinTime.hpp"
    3838
    3939//#############################################################################
     
    8585  if (argc>=2) mpsFileName = argv[1];
    8686  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    87   assert(numMpsReadErrors==0);
     87  if( numMpsReadErrors != 0 )
     88  {
     89     printf("%d errors reading MPS file\n", numMpsReadErrors);
     90     return numMpsReadErrors;
     91  }
    8892  double time1 = CoinCpuTime();
    8993
  • stable/2.8/Cbc/examples/sample3.cpp

    r1660 r1902  
    9191  solver1.getModelPtr()->setDualBound(1.0e10);
    9292
     93  if (argc <= 1) {
     94     printf("using %s <modelfile>\n", argv[0]);
     95     return 1;
     96  }
     97
    9398  // Read in model using argv[1]
    9499  // and assert that it is a clean model
    95100  int numMpsReadErrors = solver1.readMps(argv[1],"");
    96   assert(numMpsReadErrors==0);
     101  if( numMpsReadErrors != 0 )
     102  {
     103     printf("%d errors reading MPS file\n", numMpsReadErrors);
     104     return numMpsReadErrors;
     105  }
    97106  // do here so integers correct
    98107  CbcModel model(solver1);
  • stable/2.8/Cbc/examples/sample4.cpp

    r1660 r1902  
    2626/************************************************************************
    2727
    28 This main program reads in an SOSr model (ltw) from an mps file.
     28This main program reads in an SOS model (rgn) from an mps file.
    2929
    3030It then solves it three ways :-
     
    3232a) As normal
    3333b) SOS 1
    34 c) SOS 2(so answer will be different)
     34c) SOS 2 (so answer will be different)
    3535
    3636************************************************************************/
     
    4646  model.solver()->setHintParam(OsiDoReducePrint,true,OsiHintTry);
    4747
    48   // Read in ltw.mps
    49   // and assert that it is a clean model
    50   int numMpsReadErrors = model.solver()->readMps("./ltw.mps","");
    51   assert(numMpsReadErrors==0);
     48  // Read in rgn.mps
     49  std::string mpsFileName;
     50#if defined(MIPLIB3DIR)
     51  mpsFileName = MIPLIB3DIR "/rgn";
     52#else
     53  if (argc < 2) {
     54    fprintf(stderr, "Do not know where to find miplib3 MPS files.\n");
     55    exit(1);
     56  }
     57#endif
     58  if (argc>=2) mpsFileName = argv[1];
     59  int numMpsReadErrors = model.solver()->readMps(mpsFileName.c_str(),"");
     60  if( numMpsReadErrors != 0 )
     61  {
     62     printf("%d errors reading MPS file\n", numMpsReadErrors);
     63     return numMpsReadErrors;
     64  }
    5265
    5366  // Definition of node choice
     
    7588  }
    7689
    77  
     90  if (numberColumns!=180 || numberIntegers!=100) {
     91    printf("Incorrect model for example\n");
     92    exit(1);
     93  }
     94
    7895  double time1 = CoinCpuTime() ;
    7996
    8097  model.branchAndBound();
    8198
    82   std::cout<<"ltw.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
     99  std::cout<<"rgn.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
    83100           <<model.getNodeCount()<<" nodes with objective "
    84101           <<model.getObjValue()
     
    104121  model = model2;
    105122
     123  // Convert slacks to variables
     124  CoinBigIndex start[5]={0,1,2,3,4};
     125  int row[4]={0,1,2,3};
     126  double element[4]={1.0,1.0,1.0,1.0};
     127  double up[4]={1.0,1.0,1.0,1.0};
     128  model.solver()->addCols(4,start,row,element,NULL,up,NULL);
    106129  // Now use SOS1
    107   int numberSets=8;
    108   int which[28]={20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,
    109                  39,40,41,42,43,44,45,46,47};
    110   double weights[]={1.0,2.0,3.0,4.0,5.0};
    111   int starts[]={0,2,4,6,8,13,18,23,28};
    112   CbcObject ** objects = new CbcObject * [numberSets];
     130  int numberSets=4;
     131  int which[104];
     132  double weights[104];
     133  int starts[5];
     134  // load
     135  int n=0;
     136  starts[0]=0;
     137  for (int iSet=0;iSet<4;iSet++) {
     138    for (int i=0;i<25;i++) {
     139      weights[n]=i+1.0;
     140      which[n]=iSet*25+i;
     141      n++;
     142    }
     143    // slack - make sure first branch is on slack
     144    weights[n]=1000.0;
     145    which[n]=180+iSet;
     146    n++;
     147    starts[iSet+1]=n;
     148  }
    113149  for (i=0;i<numberIntegers;i++) {
    114150    int iColumn = integerVariable[i];
     
    116152    model.solver()->setContinuous(iColumn);
    117153  }
     154  // save model in this state
     155  CbcModel modelSOS = model;
     156  CbcObject ** objects = new CbcObject * [numberSets];
    118157  for (i=0;i<numberSets;i++) {
    119158    objects[i]= new CbcSOS(&model,starts[i+1]-starts[i],which+starts[i],
     
    129168  model.branchAndBound();
    130169
    131   std::cout<<"ltw.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
     170  std::cout<<"rgn.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
    132171           <<model.getNodeCount()<<" nodes with objective "
    133172           <<model.getObjValue()
     
    151190
    152191
    153   // Restore model
    154   model = model2;
     192  // Restore SOS model
     193  model = modelSOS;
    155194
    156195// Now use SOS2
    157196  objects = new CbcObject * [numberSets];
    158   for (i=0;i<numberIntegers;i++) {
    159     int iColumn = integerVariable[i];
    160     // Stop being integer
    161     model.solver()->setContinuous(iColumn);
    162   }
    163197  for (i=0;i<numberSets;i++) {
    164198    objects[i]= new CbcSOS(&model,starts[i+1]-starts[i],which+starts[i],
     
    174208  model.branchAndBound();
    175209
    176   std::cout<<"ltw.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
     210  std::cout<<"rgn.mps"<<" took "<<CoinCpuTime()-time1<<" seconds, "
    177211           <<model.getNodeCount()<<" nodes with objective "
    178212           <<model.getObjValue()
  • stable/2.8/Cbc/examples/sample5.cpp

    r1660 r1902  
    4040#include "CoinModel.hpp"
    4141
    42 #include  "CoinTime.hpp"
     42#include "CoinTime.hpp"
    4343
    4444
  • stable/2.8/Cbc/examples/simpleBAB.cpp

    r1854 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511#include "OsiClpSolverInterface.hpp"
    1612#include "CoinPackedVector.hpp"
     
    4137  model.setInteger(0);
    4238  model.setObjSense(-1.0);
    43   bool optimal;
     39  //bool optimal;
    4440 
    4541#ifndef USE_CBC
     
    5450  model.getDblParam(OsiDualObjectiveLimit,objLimit);
    5551  model.branchAndBound();
    56   optimal = model.isProvenOptimal();
     52  //optimal = model.isProvenOptimal();
    5753  const double *val = model.getColSolution(); // x0 = 3, x1 = 0.45
    5854  printf("Solution %g %g\n",val[0],val[1]);
     
    6561    CbcModel model2(model);
    6662    model2.branchAndBound();
    67     optimal = model2.isProvenOptimal();
     63    //optimal = model2.isProvenOptimal();
    6864    const double *val = model2.getColSolution(); // x0 = 3, x1 = 0.45
    6965    printf("Solution %g %g\n",val[0],val[1]);
     
    7975#ifndef USE_CBC
    8076  model.branchAndBound();
    81   optimal = model.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
     77  //optimal = model.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
    8278  // Address of solution will be same as only adding rows - but be safe
    8379  val = model.getColSolution();
     
    8783    CbcModel model2(model);
    8884    model2.branchAndBound();
    89     optimal = model2.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
     85    //optimal = model2.isProvenOptimal(); // should be x0 = 2, x1 = 0.95
    9086    const double *val = model2.getColSolution();
    9187    printf("Solution %g %g\n",val[0],val[1]);
  • stable/2.8/Cbc/examples/sos.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9
     10#include "CoinPragma.hpp"
    1411
    1512// For Branch and bound
     
    4946  if (argc>=2) mpsFileName = argv[1];
    5047  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
    51   assert(numMpsReadErrors==0);
     48  if( numMpsReadErrors != 0 )
     49  {
     50     printf("%d errors reading MPS file\n", numMpsReadErrors);
     51     return numMpsReadErrors;
     52  }
    5253 
    5354  int iRow, iColumn;
  • stable/2.8/Cbc/examples/sudoku.cpp

    r1574 r1902  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
    149
     10#include "CoinPragma.hpp"
    1511// For Branch and bound
    1612#include "OsiSolverInterface.hpp"
     
    2622#include "CglStored.hpp"
    2723
    28 #include  "CoinTime.hpp"
     24#include "CoinTime.hpp"
    2925
    3026
  • stable/2.8/Cbc/src/CbcBranchAllDifferent.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchAllDifferent.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchDecision.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchDecision.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchDefaultDecision.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchDefaultDecision.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchToFixLots.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchToFixLots.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchingObject.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcBranchingObject.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCbcParam.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcClique.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcClique.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompare.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareDefault.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareDefault.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareDepth.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareDepth.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareEstimate.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareEstimate.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareObjective.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCompareObjective.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcConsequence.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcConsequence.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCutModifier.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCutModifier.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCutSubsetModifier.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcCutSubsetModifier.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcDummyBranchingObject.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcDummyBranchingObject.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcFathom.hpp

    r1573 r1902  
    7676
    7777};
    78 #ifdef COIN_HAS_CLP
     78
    7979#include "OsiClpSolverInterface.hpp"
    8080
     
    136136};
    137137#endif
    138 #endif
    139 
  • stable/2.8/Cbc/src/CbcFixVariable.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcFixVariable.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcFollowOn.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcFollowOn.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcFullNodeInfo.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcFullNodeInfo.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenBaB.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenCbcParam.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenCbcParam.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenCbcParamUtils.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenCtlBlk.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenCtlBlk.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenMessages.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenMessages.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenOsiParam.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenOsiParam.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenOsiParamUtils.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenParam.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenParam.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenParamUtils.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenSolution.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGenSolvers.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGeneral.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGeneral.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGeneralDepth.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGeneralDepth.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcGeneric.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDINS.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDINS.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDive.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDive.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveCoefficient.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveCoefficient.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveFractional.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveFractional.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveGuided.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveGuided.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveLineSearch.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveLineSearch.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDivePseudoCost.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDivePseudoCost.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveVectorLength.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicDiveVectorLength.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicPivotAndFix.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicPivotAndFix.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicRENS.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicRENS.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicRINS.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicRINS.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicRandRound.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicRandRound.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicVND.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcHeuristicVND.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcLinked.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcLinked.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcLinkedUtils.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcMipStartIO.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcMipStartIO.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcModel.cpp

    r1888 r1902  
    62656265    maximumDepthActual_ = 0;
    62666266    numberDJFixed_ = 0.0;
    6267     delete probingInfo_;
    6268     probingInfo_ = NULL;
     6267    if (probingInfo_) {
     6268      delete probingInfo_;
     6269      probingInfo_ = NULL;
     6270      if (!generator_)
     6271        numberCutGenerators_=0;
     6272      // also get rid of cut generator
     6273      int n=0;
     6274      for (int i = 0; i < numberCutGenerators_; i++) {
     6275        CglImplication * cutGen;
     6276        cutGen = dynamic_cast<CglImplication *>(generator_[i]->generator());
     6277        if (!cutGen) {
     6278          generator_[n]=generator_[i];
     6279          virginGenerator_[n]=virginGenerator_[i];
     6280          n++;
     6281        } else {
     6282          cutGen->setProbingInfo(NULL);
     6283          delete generator_[i];
     6284          cutGen = dynamic_cast<CglImplication *>(virginGenerator_[i]->generator());
     6285          assert (cutGen);
     6286          cutGen->setProbingInfo(NULL);
     6287          delete virginGenerator_[i];
     6288        }
     6289      }
     6290      numberCutGenerators_=n;
     6291    }
    62696292    maximumStatistics_ = 0;
    62706293    delete [] analyzeResults_;
     
    1631116334    }
    1631216335}
     16336#else
     16337CbcModel::goToDantzig(int numberNodes, ClpDualRowPivot *& savePivotMethod)
     16338{
     16339   printf("Need Clp to go to Dantzig\n");
     16340   abort();
     16341}
    1631316342#endif
    1631416343// Below this is deprecated or at least fairly deprecated
  • stable/2.8/Cbc/src/CbcModel.hpp

    r1883 r1902  
    3939class CbcEventHandler ;
    4040class CglPreProcess;
    41 # ifdef COIN_HAS_CLP
    4241class OsiClpSolverInterface;
    4342class ClpNodeStuff;
    44 #endif
     43
    4544// #define CBC_CHECK_BASIS 1
    4645
     
    18601859    { temporaryPointer_=pointer;}
    18611860    /// Go to dantzig pivot selection if easy problem (clp only)
    1862 #ifdef COIN_HAS_CLP
    18631861    void goToDantzig(int numberNodes, ClpDualRowPivot *& savePivotMethod);
    1864 #endif
    18651862    /// Now we may not own objects - just point to solver's objects
    18661863    inline bool ownObjects() const {
     
    22722269        maximumNumberIterations_ = value;
    22732270    }
    2274 # ifdef COIN_HAS_CLP
    22752271    /// Set depth for fast nodes
    22762272    inline void setFastNodeDepth(int value) {
     
    22932289        numberExtraIterations_ += iterations;
    22942290    }
    2295 #endif
    22962291    /// Number of extra iterations
    22972292    inline int numberExtraIterations() const {
  • stable/2.8/Cbc/src/CbcNWay.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcNWay.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcNodeInfo.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcNodeInfo.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcObject.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcObject.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcObjectUpdateData.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcObjectUpdateData.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcPartialNodeInfo.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcPartialNodeInfo.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSOS.cpp

    • Property svn:eol-style set to native
    r1854 r1902  
    222222                // Could change to #ifdef CBC_DEBUG
    223223#ifndef NDEBUG
    224                 if (model_->messageHandler()->logLevel() > 2)
     224                if (model_->messageHandler()->logLevel() > 2 &&
     225                    value > upper[iColumn] + integerTolerance)
    225226                    printf("** Variable %d (%d) has value %g and upper bound of %g\n",
    226227                           iColumn, j, value, upper[iColumn]);
  • stable/2.8/Cbc/src/CbcSOS.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSimpleInteger.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSimpleInteger.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSimpleIntegerDynamicPseudoCost.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSimpleIntegerDynamicPseudoCost.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSimpleIntegerPseudoCost.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSimpleIntegerPseudoCost.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolver.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolver.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolverAnalyze.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolverAnalyze.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolverExpandKnapsack.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolverExpandKnapsack.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolverHeuristics.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSolverHeuristics.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSubProblem.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcSubProblem.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/CbcThread.cpp

    • Property svn:eol-style set to native
    r1888 r1902  
    11271127            if (thisModel->parallelMode() >= 0) {
    11281128                CbcNode * node = stuff->node();
    1129                 assert (node->nodeInfo());
     1129                //assert (node->nodeInfo());
    11301130                CbcNode * createdNode = stuff->createdNode();
    1131                 thisModel->doOneNode(baseModel, node, createdNode);
     1131                // try and see if this has slipped through
     1132                if (node) {
     1133                  thisModel->doOneNode(baseModel, node, createdNode);
     1134                } else {
     1135                  //printf("null node\n");
     1136                  createdNode=NULL;
     1137                }
    11321138                stuff->setNode(node);
    11331139                stuff->setCreatedNode(createdNode);
  • stable/2.8/Cbc/src/CbcThread.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/Cbc_C_Interface.cpp

    r1888 r1902  
    22662266COINLIBAPI void  COINLINKAGE
    22672267Cbc_addSOS_Dense(Cbc_Model * model, int numObjects, const int * len,
    2268                  const int ** which, const double * weights, const int type)
     2268                 const int * const* which, const double * weights, const int type)
    22692269{
    22702270    const char prefix[] = "Cbc_C_Interface::Cbc_addSOS_Dense(): ";
  • stable/2.8/Cbc/src/Cbc_C_Interface.h

    r1600 r1902  
    629629    COINLIBAPI void  COINLINKAGE
    630630    Cbc_addSOS_Dense(Cbc_Model * model, int numObjects, const int * len,
    631                      const int ** which, const double * weights, const int type)
     631                     const int * const * which, const double * weights, const int type)
    632632    ;
    633633    /** Add SOS constraints to the model using row-order matrix */
  • stable/2.8/Cbc/src/ClpAmplObjective.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/ClpConstraintAmpl.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/Makefile.am

    r1840 r1902  
    193193        CbcBranchDynamic.hpp \
    194194        CbcBranchCut.hpp \
    195         CbcBranchDecision.hpp \
     195        CbcBranchDecision.hpp \
    196196        CbcBranchDefaultDecision.hpp \
    197197        CbcBranchingObject.hpp \
     
    214214        CbcFathom.hpp \
    215215        CbcEventHandler.hpp \
     216        CbcFathomDynamicProgramming.hpp \
    216217        CbcFeasibilityBase.hpp \
    217218        CbcFixVariable.hpp \
  • stable/2.8/Cbc/src/Makefile.in

    • Property svn:keywords changed from "Author Date Id Revision" to Author Date Id Revision
    r1840 r1902  
    653653        CbcBranchDynamic.hpp \
    654654        CbcBranchCut.hpp \
    655         CbcBranchDecision.hpp \
     655        CbcBranchDecision.hpp \
    656656        CbcBranchDefaultDecision.hpp \
    657657        CbcBranchingObject.hpp \
     
    674674        CbcFathom.hpp \
    675675        CbcEventHandler.hpp \
     676        CbcFathomDynamicProgramming.hpp \
    676677        CbcFeasibilityBase.hpp \
    677678        CbcFixVariable.hpp \
  • stable/2.8/Cbc/src/OsiCbc/Makefile.am

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/OsiCbc/Makefile.in

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Revision
  • stable/2.8/Cbc/src/OsiCbc/OsiCbcSolverInterface.cpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/OsiCbc/OsiCbcSolverInterface.hpp

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/config.h.in

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/config_cbc.h.in

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/config_cbc_default.h

    • Property svn:eol-style set to native
  • stable/2.8/Cbc/src/config_default.h

    • Property svn:eol-style set to native
Note: See TracChangeset for help on using the changeset viewer.