Changeset 1654 for trunk


Ignore:
Timestamp:
May 25, 2011 4:58:17 AM (8 years ago)
Author:
forrest
Message:

allow postprocessing when preprocessing inside CbcModel? solves problem

File:
1 edited

Legend:

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

    r1652 r1654  
    20112011        solverCharacteristics_ = NULL;
    20122012        return ;
    2013     } else if (!numberObjects_) {
     2013    } else if (!numberObjects_ && (!strategy_ || strategy_->preProcessState() <= 0)) {
    20142014        // nothing to do
    20152015        solverCharacteristics_ = NULL;
     
    23892389    */
    23902390    // Do heuristics
    2391     doHeuristicsAtRoot();
     2391    if (numberObjects_)
     2392        doHeuristicsAtRoot();
    23922393    /*
    23932394      Grepping through the code, it would appear that this is a command line
Note: See TracChangeset for help on using the changeset viewer.