Changeset 1769 for trunk/Clp/src/ClpSimplexPrimal.cpp

Timestamp:

Jul 26, 2011 5:31:51 AM (10 years ago)

Author:

forrest

Message:

changes for advanced use of Clp

File:

• trunk/Clp/src/ClpSimplexPrimal.cpp (modified) (2 diffs)

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -895 +895 @@
           int status = eventHandler_->event(ClpEventHandler::goodFactorization);
           if (status >= 0) {
-            numberThrownOut=status;
-          } else {
-            numberThrownOut = gutsOfSolution(NULL, NULL, (firstFree_ >= 0));
+            lastSumInfeasibility = COIN_DBL_MAX;
           }
-#else
+#endif
           numberThrownOut = gutsOfSolution(NULL, NULL, (firstFree_ >= 0));
-#endif
           double sumInfeasibility =  nonLinearCost_->sumInfeasibilities();
           int reason2 = 0;
@@ -3163 +3160 @@
           if (pivotRow_ >= numberRows_)
                pivotRow_ = -1;
+#ifdef CLP_USER_DRIVEN
+          if (theta_<0.0) {
+            if (theta_>=-1.0e-12)
+              theta_=0.0;
+            //else
+            //printf("negative theta %g\n",theta_);
+          }
+#endif
           updatePrimalsInPrimal(rowArray_[1], theta_, objectiveChange, ifValuesPass);
           pivotRow_ = savePivot;