Changeset 1426 for trunk

Timestamp:

Aug 29, 2009 11:39:30 AM (12 years ago)

Author:

forrest

Message:

minor changes for an idea

Location:

trunk/Clp/src

Files:

• CbcOrClpParam.cpp (modified) (1 diff)
• ClpSimplex.cpp (modified) (2 diffs)
• ClpSimplex.hpp (modified) (2 diffs)
• ClpSimplexDual.cpp (modified) (1 diff)

trunk/Clp/src/CbcOrClpParam.cpp

@@ -2324 +2324 @@
     (
      "Yet more ideas for Feasibility Pump \n\
+\t/1000 == 1 Pump will run twice if no solution found\n\
+\t/1000 == 2 Pump will only run after root cuts if no solution found\n\
+\t/1000 >10 as above but even if solution found\n\
 \t/100 == 1,3.. exact 1.0 for objective values\n\
 \t/100 == 2,3.. allow more iterations per pass\n\

trunk/Clp/src/ClpSimplex.cpp

@@ -638 +638 @@
       return numberOut;
   }
-
+  if ((moreSpecialOptions_&128)!=0&&!numberIterations_) {
+    //printf("trying feas pump\n");
+    const char * integerType = integerInformation();
+    assert (integerType);
+    assert (perturbationArray_);
+    CoinZeroN(cost_,numberRows_+numberColumns_);
+    for (int i=0;i<numberRows_-numberRows_;i++) {
+      int iSequence = pivotVariable_[i];
+      if (iSequence<numberColumns_&&integerType[iSequence]) {
+        double lower =lower_[iSequence];
+        double upper = upper_[iSequence];
+        double value = solution_[iSequence];
+        if (value>=lower-primalTolerance_&&
+            value<=upper+primalTolerance_) {
+          double sign;
+          if (value-lower<upper-value) 
+            sign=1.0;
+          else
+            sign=-1.0;
+          cost_[iSequence]=sign*perturbationArray_[iSequence];
+        }
+      }
+    }
+  }
   computeDuals(givenDuals);
+  if ((moreSpecialOptions_&128)!=0&&!numberIterations_) {
+    const char * integerType = integerInformation();
+    // Need to do columns and rows to stay dual feasible
+    for (int iSequence=0;iSequence<numberColumns_;iSequence++) {
+      if (integerType[iSequence]&&getStatus(iSequence)!=basic) {
+        double djValue=dj_[iSequence];
+        double change=0.0;
+        if (getStatus(iSequence)==atLowerBound) 
+          change = CoinMax(-djValue,10.0*perturbationArray_[iSequence]);
+        else if (getStatus(iSequence)==atUpperBound) 
+          change = CoinMin(-djValue,-10.0*perturbationArray_[iSequence]);
+        cost_[iSequence]=change;
+        dj_[iSequence]+=change;
+      }
+    }
+  }
 
   // now check solutions
@@ -9773 +9812 @@
 #endif
   }
-  if (numberColumns_==100) {
+  if (numberColumns_==-100) {
     const char * integerType = integerInformation();
     for (int i=0;i<100;i++) {

trunk/Clp/src/ClpSimplex.hpp

@@ -951 +951 @@
       32 bit - say optimal if primal feasible!
       64 bit - give up easily in dual (and say infeasible)
+      128 bit - no objective, 0-1 and in B&B
   */
   inline int moreSpecialOptions() const
@@ -962 +963 @@
       32 bit - say optimal if primal feasible!
       64 bit - give up easily in dual (and say infeasible)
+      128 bit - no objective, 0-1 and in B&B
   */
   inline void setMoreSpecialOptions(int value)

trunk/Clp/src/ClpSimplexDual.cpp

@@ -5343 +5343 @@
     double * sort = new double[numberColumns_];
     // Use objective BEFORE scaling
-    const double * obj = objective();
+    const double * obj = ((moreSpecialOptions_&128)==0) ? objective() : cost_;
     int i;
     for (i=0;i<numberColumns_;i++) {