Ignore:
File:
1 edited

Legend:

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

    r1888 r2094  
    118118    if (model_->getNodeCount() > numberTimes_)
    119119        return 0;
     120#ifdef HEURISTIC_INFORM
     121    printf("Entering heuristic %s - nRuns %d numCould %d when %d\n",
     122           heuristicName(),numRuns_,numCouldRun_,when_);
     123#endif
    120124    // See if at root node
    121125    bool atRoot = model_->getNodeCount() == 0;
    122126    int passNumber = model_->getCurrentPassNumber();
    123     if (atRoot && passNumber != 1)
     127    if (atRoot && passNumber > 1)
    124128        return 0;
    125129    OsiSolverInterface * solver = model_->solver();
     
    537541    bool atRoot = model_->getNodeCount() == 0;
    538542    int passNumber = model_->getCurrentPassNumber();
    539     if (atRoot && passNumber != 1)
     543    if (atRoot && passNumber > 1)
    540544        return 0;
    541545    OsiSolverInterface * solver = model_->solver();
     
    973977    bool atRoot = model_->getNodeCount() == 0;
    974978    int passNumber = model_->getCurrentPassNumber();
    975     if (atRoot && passNumber != 1)
     979    if (atRoot && passNumber > 1)
    976980        return 0;
    977981    OsiSolverInterface * solver = model_->solver();
Note: See TracChangeset for help on using the changeset viewer.