Changeset 2201

Timestamp:

Jun 23, 2015 9:22:42 AM (4 years ago)

Author:

stefan

Message:

have assert active only if not NDEBUG; remove workaround, bug should have been fixed by now

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (1 diff)

trunk/Cbc/src/CbcModel.cpp

@@ -7326 +7326 @@
             cutsToDrop = new int[currentNumberCuts] ;
             assert (currentNumberCuts + numberRowsAtContinuous_ <= lastws->getNumArtificial());
-#undef NDEBUG
             assert (currentNumberCuts <= maximumWhich_); // we will read from whichGenerator_[0..currentNumberCuts-1] below, so should have all these entries
-            // the above assert fails in certain situations, which indicates a bug in the code below
-            // as a workaround, resize whichGenerator_ to make sure we can read all entries without an invalid read from valgrind (and subsequent crash somewhere, seems so)
-            resizeWhichGenerator(maximumWhich_, currentNumberCuts);
             for (i = 0; i < currentNumberCuts; i++) {
                 CoinWarmStartBasis::Status status =