fix wrong assert

Author: jjhforrest

src/ClpSimplex.cpp

@@ -11454,7 +11454,7 @@ int ClpSimplex::fathom(void *stuff)
     int *whichColumn = new int[2 * numberColumns_];
     int nBound;
     bool tightenBounds = ((specialOptions_ & 64) == 0) ? false : true;
-    //numberRows_=-numberRows_;//!! flag to say do more work (if test in crunch)
+    numberRows_=-numberRows_;//!! flag to say do more work (if test in crunch)
     ClpSimplex *small = static_cast< ClpSimplexOther * >(this)->crunch(rhs, whichRow, whichColumn,
       nBound, false, tightenBounds);
     if (small) {
@@ -12177,7 +12177,7 @@ int ClpSimplex::fathomMany(void *stuff)
     int *whichRow = new int[3 * numberRows_];
     int *whichColumn = new int[2 * numberColumns_];
     int nBound;
-    //numberRows_=-numberRows_;//!! flag to say do more work (if test in crunch)
+    numberRows_=-numberRows_;//!! flag to say do more work (if test in crunch)
     bool tightenBounds = ((specialOptions_ & 64) == 0) ? false : true;
     ClpSimplex *small = static_cast< ClpSimplexOther * >(this)->crunch(rhs, whichRow, whichColumn,
       nBound, false, tightenBounds);

src/ClpSimplexOther.cpp

@@ -1775,7 +1775,7 @@ ClpSimplex *
 ClpSimplexOther::crunch(double *rhs, int *whichRow, int *whichColumn,
   int &nBound, bool moreBounds, bool tightenBounds)
 {
-#if 0
+#if 1
   /* If you only want to find redundant rows before fathom then
      use this and set numberRows_ negative before this call (in ClpSimplex.cpp)
   */
@@ -1786,7 +1786,7 @@ ClpSimplexOther::crunch(double *rhs, int *whichRow, int *whichColumn,
   }
 #else
   assert (numberRows_>=0);
-  bool takeOutSome=false;//true;
+  bool takeOutSome=true;
 #endif
   //#define CHECK_STATUS
 #ifdef CHECK_STATUS

src/OsiClp/OsiClpSolverInterface.cpp

@@ -7940,8 +7940,11 @@ void OsiClpSolverInterface::crunch()
       nBound, moreBounds, tightenBounds);
 #ifndef NDEBUG
     int nCopy = 3 * numberRows + 2 * numberColumns;
-    for (int i = 0; i < nCopy; i++)
+    for (int i = 0; i < nCopy; i++) {
+      if (i>=small->getNumRows()&&i<numberRows)
+	continue;  // row was removed so doesn't matter
       assert(whichRow[i] >= -CoinMax(numberRows, numberColumns) && whichRow[i] < CoinMax(numberRows, numberColumns));
+    }
 #endif
     smallModel_ = small;
     spareArrays_ = spareArrays;
@@ -7953,8 +7956,11 @@ void OsiClpSolverInterface::crunch()
     int nCopy = 3 * numberRows + 2 * numberColumns;
     nBound = whichRow[nCopy];
 #ifndef NDEBUG
-    for (int i = 0; i < nCopy; i++)
+    for (int i = 0; i < nCopy; i++) {
+      if (i>=smallModel_->getNumRows()&&i<numberRows)
+	continue;  // row was removed so doesn't matter
       assert(whichRow[i] >= -CoinMax(numberRows, numberColumns) && whichRow[i] < CoinMax(numberRows, numberColumns));
+    }
 #endif
     small = smallModel_;
   }