Changeset 1469


Ignore:
Timestamp:
Mar 15, 2019 12:16:04 PM (5 weeks ago)
Author:
stefan
Message:

sync with trunk

Location:
stable/0.60
Files:
13 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable/0.60

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.8/
        2 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.11/
        3 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.11.0/CoinUtils
        4 Osi  https://projects.coin-or.org/svn/Osi/releases/0.108.0/Osi
        5 Clp  https://projects.coin-or.org/svn/Clp/releases/1.17.0/Clp
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.8
         2Data/Sample https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         3CoinUtils   https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
         4Osi         https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
         5Clp         https://projects.coin-or.org/svn/Clp/stable/1.17/Clp
        66
    • Property svn:mergeinfo changed
      /trunk (added)merged: 1451,​1459-1468
  • stable/0.60/Cgl

  • stable/0.60/Cgl/MSVisualStudio/v10/CglUnitTest/CglUnitTest.vcxproj

    r1100 r1469  
    8989    <ClCompile>
    9090      <Optimization>Disabled</Optimization>
    91       <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     91      <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src\CglZeroHalf;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9292      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";TESTDIR="..\\..\\..\\test\\CglTestData";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9393      <MinimalRebuild>true</MinimalRebuild>
     
    114114      <Optimization>MaxSpeed</Optimization>
    115115      <IntrinsicFunctions>true</IntrinsicFunctions>
    116       <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     116      <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src\CglZeroHalf;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    117117      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";TESTDIR="..\\..\\..\\test\\CglTestData";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    118118      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     
    142142    <ClCompile>
    143143      <Optimization>Disabled</Optimization>
    144       <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     144      <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src\CglZeroHalf;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    145145      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";TESTDIR="..\\..\\..\\test\\CglTestData";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    146146      <MinimalRebuild>true</MinimalRebuild>
     
    170170      <Optimization>MaxSpeed</Optimization>
    171171      <IntrinsicFunctions>true</IntrinsicFunctions>
    172       <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     172      <AdditionalIncludeDirectories>..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src\CglZeroHalf;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    173173      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR="..\\..\\..\\..\\Data\\Sample";TESTDIR="..\\..\\..\\test\\CglTestData";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    174174      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  • stable/0.60/Cgl/MSVisualStudio/v9/CglUnitTest/CglUnitTest.vcproj

    r893 r1469  
    4545                                Name="VCCLCompilerTool"
    4646                                Optimization="0"
    47                                 AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
     47                                AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglZeroHalf;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
    4848                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;;TESTDIR=\&quot;..\\..\\..\\test\\CglTestData\&quot;"
    4949                                MinimalRebuild="true"
     
    119119                                Optimization="2"
    120120                                EnableIntrinsicFunctions="true"
    121                                 AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
     121                                AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src\CglZeroHalf;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
    122122                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;;TESTDIR=\&quot;..\\..\\..\\test\\CglTestData\&quot;"
    123123                                RuntimeLibrary="2"
     
    193193                                Name="VCCLCompilerTool"
    194194                                Optimization="0"
    195                                 AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
     195                                AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src\CglZeroHalf;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
    196196                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;;TESTDIR=\&quot;..\\..\\..\\test\\CglTestData\&quot;"
    197197                                MinimalRebuild="true"
     
    268268                                Optimization="2"
    269269                                EnableIntrinsicFunctions="true"
    270                                 AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
     270                                AdditionalIncludeDirectories="..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglLandP;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglRedSplit2;..\..\..\src\CglResidualCapacity;..\..\..\src\CglSimpleRounding;..\..\..\src\CglTwomir;..\..\..\src\CglZeroHalf;..\..\..\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
    271271                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;COIN_HAS_OSICLP;SAMPLEDIR=\&quot;..\\..\\..\\..\\Data\\Sample\&quot;;TESTDIR=\&quot;..\\..\\..\\test\\CglTestData\&quot;"
    272272                                RuntimeLibrary="2"
  • stable/0.60/Cgl/README

    r908 r1469  
    1 CUT GENERATION LIBRARY README
    2 =============================
    3 
    4 In this document, the following names are used:
    5 
    6 1. 'coin-Cgl' is the full path to the directory in which you have
    7    dowloaded Cgl.
    8 
    9 2. 'build' is the full path to the directory used for the installation
    10    of Cgl. It might be coin-Cgl or any other directory of your choosing.
    11 
    12 
    13 OVERVIEW
    14 ========
    15 
    16 Welcome to the COIN-OR Cut Generator Library (Cgl). Cgl is
    17 distributed under the Eclipse Public License Version 1.0 and is freely
    18 redistributable. All source code and documentation is copyright
    19 by International Business Machines Corporation and others.
    20 This README file may be distributed freely.
    21 
    22 The COIN-OR Cut Generation Library is a collection of cut
    23 generators that can be used with other COIN-OR projects that make
    24 use of cuts, such as, among others, the linear solver Clp or the
    25 mixed integer linear programming solvers Cbc or BCP.
    26 
    27 Each cut generator is in a separate directory with its own maintainer.
    28 Maintainer names are listed in the AUTHORS file in the Cgl directory.
    29 For more information, see the Cgl Trac page (see below).
    30 
    31 
    32 CGL TRAC PAGE
    33 =============
    34 
    35 https://projects.coin-or.org/Cgl
    36 
    37 
    38 INSTALLATION
    39 ============
    40 
    41 If you have downloaded the Cgl package in the local directory coin-Cgl,
    42 please see the INSTALL file in coin-Cgl for a guide to install this package.
    43 
    44 If you have obtained Cgl by downloading another package, Cgl should be
    45 installed as part of the installation of that package. See the INSTALL
    46 file in the main directory of the package.
    47 
    48 
    49 SUPPORT
    50 =======
    51 
    52 1. Authors
    53 
    54    See the AUTHORS file.
    55 
    56 2. Project Managers
    57 
    58    Robin Lougee-Heimer, robinlh@us.ibm.com
    59    Francois Margot, fmargot@andrew.cmu.edu
    60 
    61 3. Mailing List
    62 
    63    Cgl users should use the Cgl mailing list. To subscribe, go to
    64    http://list.coin-or.org/mailman/listinfo/cgl
    65 
    66 4. Bug Reports
    67 
    68    Bug reports should be posted to the Cgl mailing list and/or on the
    69    Cgl Trac page.
     1This is the Cgl project. For information on the purpose of
     2this project please visit https://github.com/coin-or/Cgl
  • stable/0.60/Cgl/src/CglMixedIntegerRounding/CglMixedIntegerRounding.cpp

    r1387 r1469  
    16941694  fprintf(fp,"3  mixedIntegerRounding.setCRITERION_(%d);\n",CRITERION_);
    16951695  if (doPreproc_!=other.doPreproc_)
    1696     fprintf(fp,"3  mixedIntegerRounding.setDoPreproc_(%d);\n", doPreproc_);
     1696    fprintf(fp,"3  mixedIntegerRounding.setDoPreproc(%d);\n", doPreproc_);
    16971697  if (getAggressiveness()!=other.getAggressiveness())
    16981698    fprintf(fp,"3  mixedIntegerRounding.setAggressiveness(%d);\n",getAggressiveness());
  • stable/0.60/Cgl/src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp

    r1387 r1469  
    17931793  fprintf(fp,"3  mixedIntegerRounding2.setCRITERION_(%d);\n",CRITERION_);
    17941794  if (doPreproc_!=other.doPreproc_)
    1795     fprintf(fp,"3  mixedIntegerRounding2.setDoPreproc_(%d);\n", doPreproc_);
     1795    fprintf(fp,"3  mixedIntegerRounding2.setDoPreproc(%d);\n", doPreproc_);
    17961796  if (getAggressiveness()!=other.getAggressiveness())
    17971797    fprintf(fp,"3  mixedIntegerRounding2.setAggressiveness(%d);\n",getAggressiveness());
  • stable/0.60/Cgl/src/CglTwomir

  • stable/0.60/Cgl/src/CglTwomir/CglTwomir.cpp

    r1409 r1469  
    146146      for (int i=0;i<numberColumns;i++) {
    147147        if (colLower[i]<-1.0e20&&colUpper[i]>1.0e20) {
    148           double lower=-COIN_DBL_MAX;
    149           double upper=COIN_DBL_MAX;
     148          double lower=-si.getInfinity();
     149          double upper=si.getInfinity();
    150150          if (solution[i]>0.0)
    151151            lower=-1.0e10;
     
    262262      clpSolver->setBasis(*warm);
    263263      delete warm;
    264       simplex->setDualObjectiveLimit(COIN_DBL_MAX);
     264      simplex->setDualObjectiveLimit(COIN_DBL_MAX);  //FIXME should this be si->getInfinity()?
    265265      simplex->setLogLevel(0);
    266266      clpSolver->resolve();
     
    396396        if (largest<5.0e9*smallest&&goodCut) {
    397397          rowcut.setRow(number, cutIndex, packed);
    398           rowcut.setUb(COIN_DBL_MAX);
     398          rowcut.setUb(si.getInfinity());
    399399          rowcut.setLb(rhs);
    400400          cs.insert(rowcut);
     
    402402#else
    403403        rowcut.setRow(cut->nz, cut->index, cut->coeff);
    404         rowcut.setUb(DBL_MAX);
     404        rowcut.setUb(si->getInfinity());
    405405        rowcut.setLb(cut->rhs);
    406406        cs.insert(rowcut);
     
    741741     
    742742      /* check if the row is bounded above/below and define variable bounds */
    743       if ( rowUpper[i] < COIN_DBL_MAX )
     743      if ( rowUpper[i] < si->getInfinity() )
    744744        DGG_setIsConstraintBoundedAbove(data,j);
    745       if ( rowLower[i] > -1*COIN_DBL_MAX )
     745      if ( rowLower[i] > -si->getInfinity() )
    746746        DGG_setIsConstraintBoundedBelow(data,j);
    747747
     
    750750          data->ub[j] = rowUpper[i] - rowLower[i];
    751751      else
    752           data->ub[j] = COIN_DBL_MAX;
     752          data->ub[j] = si->getInfinity();
    753753
    754754      /* compute row activity. for this we need to go to the row in question,
  • stable/0.60/Cgl/src/CglTwomir/CglTwomir.hpp

    r1119 r1469  
    297297#define DGG_NORM_CRITERIA 1
    298298
    299 /* internal representation of +infinity */
    300 #define UB_MAX DBL_MAX
    301 
    302299/* used to define how fractional a basic-integer variable must be
    303300   before choosing to use it to generate a TMIR cut on.
  • stable/0.60/Dependencies

    r1449 r1469  
    11BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.8
    2 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
    3 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
    4 Osi  https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
    5 Clp  https://projects.coin-or.org/svn/Clp/stable/1.17/Clp
     2Data/Sample https://projects.coin-or.org/svn/Data/Sample/stable/1.2
     3CoinUtils   https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
     4Osi         https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
     5Clp         https://projects.coin-or.org/svn/Clp/stable/1.17/Clp
     6
  • stable/0.60/INSTALL

    r462 r1469  
    1 
    21CUT GENERATION LIBRARY INSTALLATION
    32===================================
     3
     4The instructions here are somewhat outdated. See also README.md.
    45
    56The instruction in this file are useful only if you downloaded the
  • stable/0.60/README

    r272 r1469  
    1 
    2 To install this package, please look at the INSTALL file.
     1To install this package, please look at the INSTALL and README.md files.
    32
    43This package contains several subdirectories corresponding to COIN-OR
Note: See TracChangeset for help on using the changeset viewer.