Changeset 1255


Ignore:
Timestamp:
Oct 21, 2009 6:24:14 AM (10 years ago)
Author:
forrest
Message:

fix cut over counting and a compiler warning

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1253 r1255  
    1092010920                      newCut.mutableRow().setTestForDuplicateIndex(false);
    1092110921                      globalCuts_.insert(newCut) ;
    10922                       generator_[i]->incrementNumberCutsInTotal();
    1092310922                    } else {
    1092410923                      // obviously wrong
     
    1480614805            // out of loop
    1480714806            //printf("out of loop\n");
    14808 #ifdef CLP_INVESTIGATE2
     14807#ifdef CLP_INVESTIGATE3
    1480914808            printf("%x tree %d nodes left, done %d and %d its - time %18.6f\n",thisModel,
    1481014809                   thisModel->tree()->size(),nodesNow-nodesThisTime,
  • trunk/Cbc/src/CbcSolver.cpp

    r1240 r1255  
    41574157        int i;
    41584158        for (i=0;i<info.numberColumns;i++)
    4159           statusArray[i]= info.columnStatus[i];
     4159          statusArray[i]= static_cast<unsigned char>(info.columnStatus[i]);
    41604160        statusArray+=info.numberColumns;
    41614161        for (i=0;i<info.numberRows;i++)
    4162           statusArray[i]= info.rowStatus[i];
     4162          statusArray[i]= static_cast<unsigned char>(info.rowStatus[i]);
    41634163        CoinWarmStartBasis * basis = lpSolver->getBasis();
    41644164        solver->setWarmStart(basis);
Note: See TracChangeset for help on using the changeset viewer.