Changeset 1085


Ignore:
Timestamp:
Sep 23, 2008 6:06:44 AM (12 years ago)
Author:
forrest
Message:

fix some heuristic stuff

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1059 r1085  
    804804          for (int i=0;i<model.numberHeuristics();i++) {
    805805            const CbcHeuristicFPump* pump =
    806               dynamic_cast<const CbcHeuristicFPump*>(model_->heuristic(i));
     806              dynamic_cast<const CbcHeuristicFPump*>(model.heuristic(i));
    807807            if (pump)
    808808              gotPump=true;
  • trunk/Cbc/src/CbcSolver.cpp

    r1081 r1085  
    48144814              //parameters_[whichParam(LOCALTREE,numberParameters_,parameters_)].setCurrentOption(action);
    48154815              parameters_[whichParam(FPUMP,numberParameters_,parameters_)].setCurrentOption(action);
     4816              parameters_[whichParam(DIVINGC,numberParameters_,parameters_)].setCurrentOption(action);
     4817              parameters_[whichParam(RINS,numberParameters_,parameters_)].setCurrentOption(action);
    48164818              break;
    48174819            case GREEDY:
Note: See TracChangeset for help on using the changeset viewer.