Changeset 1922


Ignore:
Timestamp:
Feb 13, 2013 12:35:02 PM (7 years ago)
Author:
stefan
Message:

sync with trunk rev 1921

Location:
stable/1.15/Clp
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/MSVisualStudio/v10/clp/clp.vcxproj

    r1859 r1922  
    3030  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3131    <ConfigurationType>Application</ConfigurationType>
    32     <PlatformToolset>v100</PlatformToolset>
     32    <PlatformToolset>v90</PlatformToolset>
    3333  </PropertyGroup>
    3434  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3535    <ConfigurationType>Application</ConfigurationType>
    36     <PlatformToolset>v100</PlatformToolset>
    3736  </PropertyGroup>
    3837  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     
    9695      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9796      <PreprocessorDefinitions>CLP_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    98       <MinimalRebuild>true</MinimalRebuild>
    99       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    10097      <PrecompiledHeader>
    10198      </PrecompiledHeader>
    102       <WarningLevel>Level3</WarningLevel>
    103       <SuppressStartupBanner>true</SuppressStartupBanner>
    10499      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    105       <CompileAs>Default</CompileAs>
    106100    </ClCompile>
    107101    <ResourceCompile>
     
    134128      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    135129      <PreprocessorDefinitions>CLP_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    136       <MinimalRebuild>true</MinimalRebuild>
    137       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    138130      <PrecompiledHeader>
    139131      </PrecompiledHeader>
    140       <WarningLevel>Level3</WarningLevel>
    141       <SuppressStartupBanner>true</SuppressStartupBanner>
    142132      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    143       <CompileAs>Default</CompileAs>
    144133    </ClCompile>
    145134    <ResourceCompile>
     
    169158    </Midl>
    170159    <ClCompile>
    171       <Optimization>MaxSpeed</Optimization>
    172       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    173160      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    174161      <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    175162      <FunctionLevelLinking>true</FunctionLevelLinking>
    176       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    177163      <PrecompiledHeader>
    178164      </PrecompiledHeader>
    179       <WarningLevel>Level3</WarningLevel>
    180       <SuppressStartupBanner>true</SuppressStartupBanner>
    181       <CompileAs>Default</CompileAs>
    182165    </ClCompile>
    183166    <ResourceCompile>
     
    207190    </Midl>
    208191    <ClCompile>
    209       <Optimization>MaxSpeed</Optimization>
    210       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    211192      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    212193      <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    213       <FunctionLevelLinking>true</FunctionLevelLinking>
    214       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    215194      <PrecompiledHeader>
    216195      </PrecompiledHeader>
    217       <WarningLevel>Level3</WarningLevel>
    218       <SuppressStartupBanner>true</SuppressStartupBanner>
    219       <CompileAs>Default</CompileAs>
    220196    </ClCompile>
    221197    <ResourceCompile>
  • stable/1.15/Clp/MSVisualStudio/v10/libClp/libClp.vcxproj

    r1859 r1922  
    3030  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3131    <ConfigurationType>StaticLibrary</ConfigurationType>
    32     <PlatformToolset>v100</PlatformToolset>
     32    <PlatformToolset>v90</PlatformToolset>
    3333  </PropertyGroup>
    3434  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3535    <ConfigurationType>StaticLibrary</ConfigurationType>
    36     <PlatformToolset>v100</PlatformToolset>
    3736  </PropertyGroup>
    3837  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     
    8988      <MinimalRebuild>true</MinimalRebuild>
    9089      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    91       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    9290      <PrecompiledHeader>
    9391      </PrecompiledHeader>
    94       <WarningLevel>Level3</WarningLevel>
    95       <SuppressStartupBanner>true</SuppressStartupBanner>
    9692      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    97       <CompileAs>Default</CompileAs>
    9893    </ClCompile>
    9994    <ResourceCompile>
     
    107102  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    108103    <ClCompile>
    109       <Optimization>MaxSpeed</Optimization>
    110104      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    111105      <PreprocessorDefinitions>CLP_BUILD;WIN32;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    112106      <StringPooling>true</StringPooling>
    113107      <FunctionLevelLinking>true</FunctionLevelLinking>
    114       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    115108      <PrecompiledHeader>
    116109      </PrecompiledHeader>
    117       <WarningLevel>Level3</WarningLevel>
    118       <SuppressStartupBanner>true</SuppressStartupBanner>
    119       <CompileAs>Default</CompileAs>
    120110    </ClCompile>
    121111    <ResourceCompile>
     
    136126      <MinimalRebuild>true</MinimalRebuild>
    137127      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    138       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    139128      <PrecompiledHeader>
    140129      </PrecompiledHeader>
    141       <WarningLevel>Level3</WarningLevel>
    142       <SuppressStartupBanner>true</SuppressStartupBanner>
    143130      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    144       <CompileAs>Default</CompileAs>
    145131    </ClCompile>
    146132    <ResourceCompile>
     
    157143    </Midl>
    158144    <ClCompile>
    159       <Optimization>MaxSpeed</Optimization>
    160145      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    161146      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    162147      <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    163       <StringPooling>true</StringPooling>
    164       <FunctionLevelLinking>true</FunctionLevelLinking>
    165       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    166148      <PrecompiledHeader>
    167149      </PrecompiledHeader>
    168       <WarningLevel>Level3</WarningLevel>
    169       <SuppressStartupBanner>true</SuppressStartupBanner>
    170       <CompileAs>Default</CompileAs>
    171150    </ClCompile>
    172151    <ResourceCompile>
  • stable/1.15/Clp/MSVisualStudio/v10/libOsiClp/libOsiClp.vcxproj

    r1859 r1922  
    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>v100</PlatformToolset>
     31    <PlatformToolset>v90</PlatformToolset>
    3332  </PropertyGroup>
    3433  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3534    <ConfigurationType>StaticLibrary</ConfigurationType>
    36     <PlatformToolset>v100</PlatformToolset>
    3735  </PropertyGroup>
    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" />
     
    8986      <MinimalRebuild>true</MinimalRebuild>
    9087      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    91       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    9288      <PrecompiledHeader>
    9389      </PrecompiledHeader>
    94       <WarningLevel>Level3</WarningLevel>
    95       <SuppressStartupBanner>true</SuppressStartupBanner>
    9690      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
    9791      <CompileAs>Default</CompileAs>
     
    10498  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    10599    <ClCompile>
    106       <Optimization>MaxSpeed</Optimization>
    107100      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    108101      <PreprocessorDefinitions>OSI_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    109102      <StringPooling>true</StringPooling>
    110103      <FunctionLevelLinking>true</FunctionLevelLinking>
    111       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    112104      <PrecompiledHeader>
    113105      </PrecompiledHeader>
    114       <WarningLevel>Level3</WarningLevel>
    115       <SuppressStartupBanner>true</SuppressStartupBanner>
    116106      <CompileAs>Default</CompileAs>
    117107    </ClCompile>
     
    130120      <MinimalRebuild>true</MinimalRebuild>
    131121      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    132       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    133122      <PrecompiledHeader>
    134123      </PrecompiledHeader>
    135       <WarningLevel>Level3</WarningLevel>
    136       <SuppressStartupBanner>true</SuppressStartupBanner>
    137124      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    138125      <CompileAs>Default</CompileAs>
     
    148135    </Midl>
    149136    <ClCompile>
    150       <Optimization>MaxSpeed</Optimization>
    151137      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
    152138      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    153139      <PreprocessorDefinitions>OSI_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    154       <StringPooling>true</StringPooling>
    155       <FunctionLevelLinking>true</FunctionLevelLinking>
    156       <RuntimeTypeInfo>true</RuntimeTypeInfo>
    157140      <PrecompiledHeader>
    158141      </PrecompiledHeader>
    159       <WarningLevel>Level3</WarningLevel>
    160       <SuppressStartupBanner>true</SuppressStartupBanner>
    161142      <CompileAs>Default</CompileAs>
    162143    </ClCompile>
  • stable/1.15/Clp/configure

    r1911 r1922  
    2331123311  use_aboca=no
    2331223312fi;
     23313if test "$use_aboca" = yes ; then
     23314  use_aboca=1
     23315fi
    2331323316case "$use_aboca" in
    23314   yes)
    23315     use_aboca=1
    23316     ;&
    2331723317  1 | 2 | 3 | 4)
    2331823318
  • stable/1.15/Clp/configure.ac

    r1911 r1922  
    7878              [use_aboca=$enableval],
    7979              [use_aboca=no])
     80if test "$use_aboca" = yes ; then
     81  use_aboca=1
     82fi
    8083case "$use_aboca" in
    81   yes)
    82     use_aboca=1
    83     ;&
    8484  1 | 2 | 3 | 4)
    8585    AC_DEFINE_UNQUOTED([CLP_HAS_ABC], [$use_aboca], [Define to 1, 2, 3, or 4 if Aboca should be build.])
  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/ClpSimplex.hpp

    r1919 r1922  
    1717#include "ClpMatrixBase.hpp"
    1818#include "ClpSolve.hpp"
     19#include "ClpConfig.h"
    1920class ClpDualRowPivot;
    2021class ClpPrimalColumnPivot;
  • stable/1.15/Clp/src/ClpSimplexDual.cpp

    r1878 r1922  
    64326432          intParam_[ClpMaxNumIteration] = saveMaximumIterations;
    64336433          specialOptions_ = saveOptions;
    6434           if (problemStatus_ != 0 )
     6434          if (problemStatus_ != 0 && problemStatus_ != 10)
    64356435               return NULL; // say infeasible or odd
    64366436          // May be empty
  • stable/1.15/Clp/src/OsiClp

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.