Changeset 2190

Timestamp:

May 20, 2015 8:48:41 AM (4 years ago)

Author:

stefan

Message:

fix place where to add info on generator; add assert to point out an invalid read

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (2 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -7317 +7317 @@
             cutsToDrop = new int[currentNumberCuts] ;
             assert (currentNumberCuts + numberRowsAtContinuous_ <= lastws->getNumArtificial());
+            assert (currentNumberCuts <= maximumWhich_); // we will read from whichGenerator_[0..currentNumberCuts-1] below, so should have all these entries
             for (i = 0; i < currentNumberCuts; i++) {
                 CoinWarmStartBasis::Status status =
@@ -8577 +8578 @@
             if (numberToAdd > 0) {
                 int i ;
-                int * whichGenerator = whichGenerator_ -
-                  numberRowsAtContinuous_+solver_->getNumRows();
+                int * whichGenerator = whichGenerator_ + lastNumberCuts;
                 // Faster to add all at once
                 addCuts = new const OsiRowCut * [numberToAdd] ;