Changeset 1842


Ignore:
Timestamp:
Jan 25, 2013 11:36:19 AM (7 years ago)
Author:
forrest
Message:

move bad static definition

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1839 r1842  
    12331233                        model_->incrementIterationCount(model.getIterationCount());
    12341234                        model_->incrementNodeCount(model.getNodeCount());
     1235                        // update best solution
     1236                        model_->setMinimizationObjValue(model.getMinimizationObjValue());
    12351237                        for (int iGenerator = 0; iGenerator < model.numberCutGenerators(); iGenerator++) {
    12361238                            CbcCutGenerator * generator = model.cutGenerator(iGenerator);
  • trunk/Cbc/src/CbcModel.cpp

    r1841 r1842  
    360360
    361361
     362static void * doRootCbcThread(void * voidInfo);
    362363void
    363364CbcModel::analyzeObjective ()
     
    25062507      }
    25072508      delete basis;
    2508       static void * doRootCbcThread(void * voidInfo);
    25092509#ifdef CBC_THREAD
    25102510      if (numberRootThreads==1) {
Note: See TracChangeset for help on using the changeset viewer.