Ignore:
Timestamp:
May 5, 2015 9:04:34 AM (6 years ago)
Author:
stefan
Message:

more sync with trunk

Location:
stable/2.9/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc

  • stable/2.9/Cbc/src

  • stable/2.9/Cbc/src/CbcHeuristicDive.cpp

    r2127 r2187  
    7474    decayFactor_ = 1.0;
    7575    smallObjective_ = 1.0e-10;
    76     setPriorities();
    7776}
    7877
     
    234233  if (gotPriorities || priority1>priority2) {
    235234    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       priority_[i].priority=static_cast<unsigned int>(level);
     243      assert (nInteger<numberIntegers);
     244      priority_[nInteger].priority=static_cast<unsigned int>(level);
    244245      int direction=0;
    245246      if (thisOne->preferredWay()<0)
     
    248249        direction=1|1;
    249250        // at present don't try other way is not used
    250       priority_[i].direction=static_cast<unsigned char>(direction);
    251     }
     251      priority_[nInteger++].direction=static_cast<unsigned char>(direction);
     252    }
     253    assert (nInteger==numberIntegers);
    252254  }
    253255}
Note: See TracChangeset for help on using the changeset viewer.