Changeset 1785 for trunk/Clp/src/ClpSimplexDual.cpp

Timestamp:

Aug 25, 2011 6:17:49 AM (9 years ago)

Author:

forrest

Message:

patches to try and make parametrics faster

File:

• trunk/Clp/src/ClpSimplexDual.cpp (modified) (8 diffs)

trunk/Clp/src/ClpSimplexDual.cpp

@@ -1223 +1223 @@
                     bestPossiblePivot = dualColumn(rowArray_[0], columnArray_[0], rowArray_[3],
                                                    columnArray_[1], acceptablePivot, dubiousWeights);
+#if CAN_HAVE_ZERO_OBJ>1
+                    if ((specialOptions_&2097152)!=0) 
+                      theta_=0.0;
+#endif
                } else {
                     // Make sure direction plausible
@@ -1399 +1403 @@
                     //columnArray_[0]->cleanAndPackSafe(1.0e-60);
                     if (candidate == -1) {
+#if CLP_CAN_HAVE_ZERO_OBJ>1
+                    if ((specialOptions_&2097152)==0) {
+#endif
                          // make sure incoming doesn't count
                          Status saveStatus = getStatus(sequenceIn_);
@@ -1406 +1413 @@
                                                       objectiveChange, false);
                          setStatus(sequenceIn_, saveStatus);
+#if CLP_CAN_HAVE_ZERO_OBJ>1
+                    } else {
+                      rowArray_[0]->clear();
+                      rowArray_[2]->clear();
+                      columnArray_[0]->clear();
+                    }
+#endif
                     } else {
                          updateDualsInValuesPass(rowArray_[0], columnArray_[0], theta_);
@@ -3778 +3792 @@
                               if (value > dualTolerance_) {
                                    thisIncrease = true;
+#if CLP_CAN_HAVE_ZERO_OBJ<2
 #define MODIFYCOST 2
+#endif
 #if MODIFYCOST
                                    // modify cost to hit new tolerance
@@ -4666 +4682 @@
                          if (lastCleaned < numberIterations_ && numberTimesOptimal_ < 4 &&
                                    (numberChanged_ || (specialOptions_ & 4096) == 0)) {
+#if CLP_CAN_HAVE_ZERO_OBJ
                            if ((specialOptions_&2097152)==0) {
+#endif
                               doOriginalTolerance = 2;
                               numberTimesOptimal_++;
@@ -4681 +4699 @@
                               }
                               cleanDuals = 2; // If nothing changed optimal else primal
+#if CLP_CAN_HAVE_ZERO_OBJ
                            } else {
                              // no cost - skip checks
                              problemStatus_=0;
                            }
+#endif
                          } else {
                               problemStatus_ = 0; // optimal
@@ -4939 +4959 @@
                     if (givenDuals)
                          dualTolerance_ = 1.0e50;
+#if CLP_CAN_HAVE_ZERO_OBJ>1
+                    if ((specialOptions_&2097152)==0) {
+#endif
                     updateDualsInDual(rowArray_[0], columnArray_[0], rowArray_[1],
                                       0.0, objectiveChange, true);
+#if CLP_CAN_HAVE_ZERO_OBJ>1
+                    } else {
+                      rowArray_[0]->clear();
+                      rowArray_[1]->clear();
+                      columnArray_[0]->clear();
+                    }
+#endif
                     dualTolerance_ = saveTolerance;
 #if 0
@@ -4971 +5001 @@
                     if (givenDuals)
                          dualTolerance_ = 1.0e50;
+#if CLP_CAN_HAVE_ZERO_OBJ>1
+                    if ((specialOptions_&2097152)==0) {
+#endif
                     updateDualsInDual(rowArray_[0], columnArray_[0], rowArray_[1],
                                       0.0, objectiveChange, true);
+#if CLP_CAN_HAVE_ZERO_OBJ>1
+                    } else {
+                      rowArray_[0]->clear();
+                      rowArray_[1]->clear();
+                      columnArray_[0]->clear();
+                    }
+#endif
                     dualTolerance_ = saveTolerance;
                     if (!numberIterations_ && sumPrimalInfeasibilities_ >