better fix for bug - superbasic treated as free

Author: jjhforrest

Clp/src/ClpSimplexPrimal.cpp

@@ -216,7 +216,6 @@ int ClpSimplexPrimal::primal(int ifValuesPass, int startFinishOptions)
 
   algorithm_ = +1;
   moreSpecialOptions_ &= ~16; // clear check replaceColumn accuracy
-  int numberInverts=0;int lastInvertIteration=-1;
   // save data
   ClpDataSave data = saveData();
   if (problemStatus_ == 10 && sumPrimalInfeasibilities_ == -123456789.0) {
@@ -362,16 +361,6 @@ int ClpSimplexPrimal::primal(int ifValuesPass, int startFinishOptions)
           COIN_DETAIL_PRINT(printf("End small model\n"));
         }
       }
-      if (numberIterations_>lastInvertIteration) {
-	lastInvertIteration=numberIterations_;
-	numberInverts=0;
-      } else {
-	numberInverts++;
-	if (numberInverts>5) {
-	  //printf("WHAT\n");
-	  cleanStatus();
-	}
-      }
       // may factorize, checks if problem finished
       statusOfProblemInPrimal(lastCleaned, factorType, &progress_, true, ifValuesPass, saveModel);
       if (initialStatus == 10) {

Clp/src/OsiClp/OsiClpSolverInterface.cpp

@@ -1255,6 +1255,18 @@ void OsiClpSolverInterface::resolve()
 #ifdef CBC_STATISTICS
       osi_primal++;
 #endif
+      // check free really superbasic
+      const double * columnLower = modelPtr_->columnLower();
+      const double * columnUpper = modelPtr_->columnUpper();
+      int numberColumns = modelPtr_->numberColumns();
+      unsigned char * status = modelPtr_->statusArray(); 
+      for (int iColumn = 0; iColumn < numberColumns; iColumn++) {
+	if ((status[iColumn]&7)==0) {
+	  // check not just superBasic
+	  if (columnLower[iColumn]>-1.0e100||columnUpper[iColumn]<1.0e100) 
+	    status[iColumn] = 4;
+	}
+      }
       modelPtr_->primal(1, startFinishOptions);
       totalIterations += modelPtr_->numberIterations();
       lastAlgorithm_ = 1; // primal