Changeset 2480


Ignore:
Timestamp:
Feb 9, 2019 4:41:53 AM (7 days ago)
Author:
unxusr
Message:

for building with ASL

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcSolver.cpp

    r2479 r2480  
    14561456              noPrinting_ = false;
    14571457              info.logLevel = atoi(equals + 1);
    1458               int log = whichParam(CLP_PARAM_INT_LOGLEVEL, numberParameters_, parameters_);
     1458              int log = whichParam(CLP_PARAM_INT_LOGLEVEL, parameters_);
    14591459              parameters_[log].setIntValue(info.logLevel);
    14601460              // mark so won't be overWritten
     
    15411541          // need some relative granularity
    15421542          si->setDefaultBound(100.0);
    1543           double dextra3 = parameters_[whichParam(CBC_PARAM_DBL_DEXTRA3, numberParameters_, parameters_)].doubleValue();
     1543          double dextra3 = parameters_[whichParam(CBC_PARAM_DBL_DEXTRA3, parameters_)].doubleValue();
    15441544          if (dextra3)
    15451545            si->setDefaultMeshSize(dextra3);
     
    15481548          si->setBiLinearPriority(10000);
    15491549          CoinModel *model2 = reinterpret_cast< CoinModel * >(coinModel);
    1550           int logLevel = parameters_[whichParam(CLP_PARAM_INT_LOGLEVEL, numberParameters_, parameters_)].intValue();
     1550          int logLevel = parameters_[whichParam(CLP_PARAM_INT_LOGLEVEL, parameters_)].intValue();
    15511551          si->load(*model2, true, logLevel);
    15521552          // redo
     
    15561556          clpSolver->messageHandler()->setLogLevel(0);
    15571557          testOsiParameters = 0;
    1558           parameters_[whichParam(CBC_PARAM_INT_TESTOSI, numberParameters_, parameters_)].setIntValue(0);
     1558          parameters_[whichParam(CBC_PARAM_INT_TESTOSI, parameters_)].setIntValue(0);
    15591559          complicatedInteger = 1;
    15601560          if (info.cut) {
     
    94469446              double timeToGo = model_.getMaximumSeconds();
    94479447              lpSolver->setMaximumSeconds(timeToGo);
    9448               int extra1 = parameters_[whichParam(CBC_PARAM_INT_EXTRA1, numberParameters_, parameters_)].intValue();
     9448              int extra1 = parameters_[whichParam(CBC_PARAM_INT_EXTRA1, parameters_)].intValue();
    94499449              fakeMain2(*lpSolver, *clpSolver, extra1);
    94509450              lpSolver = clpSolver->getModelPtr();
Note: See TracChangeset for help on using the changeset viewer.