Ignore:
Timestamp:
Dec 6, 2009 4:21:35 PM (10 years ago)
Author:
bjarni
Message:

Renamed parameter constants in CbcParam?, CbcSolver?, and ClpAmplStuff? with same names as CbcOrClpParam? in CLP to make them more readable/search-able

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/ClpAmplStuff.cpp

    r1361 r1373  
    186186                    printing = true;
    187187                    info_.logLevel = atoi(equals + 1);
    188                     control->setIntValue(LOGLEVEL, info_.logLevel);
     188                    control->setIntValue(CLP_PARAM_INT_LOGLEVEL, info_.logLevel);
    189189                    // mark so won't be overWritten
    190190                    info_.numberRows = -1234567;
     
    237237            // need some relative granularity
    238238            si->setDefaultBound(100.0);
    239             double dextra3 = control->doubleValue(DEXTRA3);
     239            double dextra3 = control->doubleValue(CBC_PARAM_DBL_DEXTRA3);
    240240            if (dextra3)
    241241                si->setDefaultMeshSize(dextra3);
     
    244244            si->setBiLinearPriority(10000);
    245245            CoinModel * model2 = (CoinModel *) coinModel;
    246             int logLevel = control->intValue(LOGLEVEL);
     246            int logLevel = control->intValue(CLP_PARAM_INT_LOGLEVEL);
    247247            si->load(*model2, true, logLevel);
    248248            // redo
     
    250250            lpSolver = solver->getModelPtr();
    251251            solver->messageHandler()->setLogLevel(0) ;
    252             control->setIntValue(TESTOSI, 0);
     252            control->setIntValue(CBC_PARAM_INT_TESTOSI, 0);
    253253            if (info_.cut) {
    254254                printf("Sorry - can't do cuts with LOS as ruins delicate row order\n");
Note: See TracChangeset for help on using the changeset viewer.