Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc/src/CbcHeuristicDive.cpp

    r2187 r2127  
    7474    decayFactor_ = 1.0;
    7575    smallObjective_ = 1.0e-10;
     76    setPriorities();
    7677}
    7778
     
    233234  if (gotPriorities || priority1>priority2) {
    234235    priority_ = new PriorityType [numberIntegers];
    235     int nInteger=0;
    236236    for (int i = 0; i < numberObjects; i++) {
    237237      OsiObject * object = model_->modifiableObject(i);
     
    241241      int level=thisOne->priority()-priority2;
    242242      assert (level<(1<<29));
    243       assert (nInteger<numberIntegers);
    244       priority_[nInteger].priority=static_cast<unsigned int>(level);
     243      priority_[i].priority=static_cast<unsigned int>(level);
    245244      int direction=0;
    246245      if (thisOne->preferredWay()<0)
     
    249248        direction=1|1;
    250249        // at present don't try other way is not used
    251       priority_[nInteger++].direction=static_cast<unsigned char>(direction);
    252     }
    253     assert (nInteger==numberIntegers);
     250      priority_[i].direction=static_cast<unsigned char>(direction);
     251    }
    254252  }
    255253}
Note: See TracChangeset for help on using the changeset viewer.