Changeset 959 for stable/2.1


Ignore:
Timestamp:
May 31, 2008 1:36:09 PM (11 years ago)
Author:
lou
Message:

Bare INT_MAX fails under GCC 4.3. Change to COIN_INT_MAX. Matches trunk r958.

Location:
stable/2.1/Cbc/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.1/Cbc/src/CbcGenCbcParamUtils.cpp

    r640 r959  
    1414#include <cassert>
    1515
     16#include "CoinFinite.hpp"
    1617#include "CoinParam.hpp"
    1718
     
    143144
    144145  param = new CbcCbcParam(CbcCbcParam::MIPOPTIONS,
    145         "mipO!ptions","Dubious options for mip",0,INT_MAX,0,false) ;
     146        "mipO!ptions","Dubious options for mip",0,COIN_INT_MAX,0,false) ;
    146147  parameters.push_back(param) ;
    147148
    148149  param = new CbcCbcParam(CbcCbcParam::MOREMIPOPTIONS,
    149         "more!MipOptions","More dubious options for mip",-1,INT_MAX,0,false) ;
     150        "more!MipOptions","More dubious options for mip",-1,COIN_INT_MAX,0,false) ;
    150151  parameters.push_back(param) ;
    151152
    152153  param = new CbcCbcParam(CbcCbcParam::NUMBERMINI,
    153         "miniT!ree","Size of fast mini tree",0,INT_MAX,0,false) ;
     154        "miniT!ree","Size of fast mini tree",0,COIN_INT_MAX,0,false) ;
    154155  param->setObj(model) ;
    155156  param->setLongHelp(
     
    160161  param = new CbcCbcParam(CbcCbcParam::NUMBERANALYZE,
    161162        "numberA!nalyze",
    162         "Number of analysis iterations",-INT_MAX,INT_MAX,false) ;
     163        "Number of analysis iterations",-COIN_INT_MAX,COIN_INT_MAX,false) ;
    163164  param->setObj(model) ;
    164165  param->setLongHelp(
     
    243244void setCbcModelDefaults (CbcModel *model)
    244245
    245 { model->setIntParam(CbcModel::CbcMaxNumNode,(INT_MAX/2)) ;
     246{ model->setIntParam(CbcModel::CbcMaxNumNode,(COIN_INT_MAX/2)) ;
    246247  model->setIntParam(CbcModel::CbcMaxNumSol,999999) ;
    247248  model->setIntParam(CbcModel::CbcFathomDiscipline,0) ;
  • stable/2.1/Cbc/src/CbcGenOsiParamUtils.cpp

    r691 r959  
    1414#include <cassert>
    1515
     16#include "CoinFinite.hpp"
    1617#include "CoinParam.hpp"
    1718
     
    7172  param = new CbcOsiParam(CbcOsiParam::MAXITERATION,
    7273        "maxIt!erations","Iteration limit for OSI solver.",
    73                   0,INT_MAX,ival) ;
     74                  0,COIN_INT_MAX,ival) ;
    7475  param->setPushFunc(pushCbcOsiInt) ;
    7576  param->setObj(osi) ;
     
    8384  param = new CbcOsiParam(CbcOsiParam::MAXHOTITS,
    8485        "hot!StartMaxIts","Iteration limit for OSI solver hot start.",
    85                   0,INT_MAX,ival) ;
     86                  0,COIN_INT_MAX,ival) ;
    8687  param->setPushFunc(pushCbcOsiInt) ;
    8788  param->setObj(osi) ;
  • stable/2.1/Cbc/src/CbcGenParamUtils.cpp

    r640 r959  
    1616#include "CoinFileIO.hpp"
    1717
     18#include "CoinFinite.hpp"
    1819#include "CoinParam.hpp"
    1920
     
    441442
    442443  param = new CbcGenParam(CbcGenParam::PRINTOPTIONS,
    443         "pO!ptions","Dubious print options",0,INT_MAX,0,false) ;
     444        "pO!ptions","Dubious print options",0,COIN_INT_MAX,0,false) ;
    444445  param->setObj(ctlBlk) ;
    445446  param->setPushFunc(pushCbcGenIntParam) ;
     
    609610
    610611  param = new CbcGenParam(CbcGenParam::USERCBC,
    611                           "userCbc","Hand coded Cbc stuff",0,INT_MAX,0,false) ;
     612                          "userCbc","Hand coded Cbc stuff",0,COIN_INT_MAX,0,false) ;
    612613  param->setObj(ctlBlk) ;
    613614  param->setLongHelp(
Note: See TracChangeset for help on using the changeset viewer.