Changeset 2187 for stable/2.9/Cbc/src/CbcHeuristicDive.cpp

Timestamp:

May 5, 2015 9:04:34 AM (6 years ago)

Author:

stefan

Message:

more sync with trunk

Location:

stable/2.9/Cbc

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/CbcHeuristicDive.cpp (modified) (4 diffs)

stable/2.9/Cbc/src/CbcHeuristicDive.cpp

@@ -74 +74 @@
     decayFactor_ = 1.0;
     smallObjective_ = 1.0e-10;
-    setPriorities();
 }
 
@@ -234 +233 @@
   if (gotPriorities || priority1>priority2) {
     priority_ = new PriorityType [numberIntegers];
+    int nInteger=0;
     for (int i = 0; i < numberObjects; i++) {
       OsiObject * object = model_->modifiableObject(i);
@@ -241 +241 @@
       int level=thisOne->priority()-priority2;
       assert (level<(1<<29));
-      priority_[i].priority=static_cast<unsigned int>(level);
+      assert (nInteger<numberIntegers);
+      priority_[nInteger].priority=static_cast<unsigned int>(level);
       int direction=0;
       if (thisOne->preferredWay()<0) 
@@ -248 +249 @@
         direction=1|1;
         // at present don't try other way is not used
-      priority_[i].direction=static_cast<unsigned char>(direction);
-    }
+      priority_[nInteger++].direction=static_cast<unsigned char>(direction);
+    }
+    assert (nInteger==numberIntegers);
   }
 }