Changeset 1533 for trunk

Timestamp:

Mar 23, 2010 11:26:32 AM (11 years ago)

Author:

forrest

Message:

make it easier to play with multiple Lp solutions

Location:

trunk

Files:

• . (modified) (1 prop)
• Clp/src/ClpEventHandler.hpp (modified) (1 diff)
• Clp/src/ClpSimplex.hpp (modified) (4 diffs)
• Clp/src/ClpSimplexPrimal.cpp (modified) (5 diffs)

trunk/Clp/src/ClpEventHandler.hpp

@@ -37 +37 @@
           treeStatus, // for Cbc
           solution, // for Cbc
-          theta // hit in parametrics
+          theta, // hit in parametrics
+          pivotRow // used to choose pivot row
      };
      /**@name Virtual method that the derived classe should provide.

trunk/Clp/src/ClpSimplex.hpp

@@ -642 +642 @@
                                     const double * lower, const double * gradient);
      /// dual row pivot choice
-     ClpDualRowPivot * dualRowPivot() const {
+     inline ClpDualRowPivot * dualRowPivot() const {
           return dualRowPivot_;
+     }
+     /// primal column pivot choice
+     inline ClpPrimalColumnPivot * primalColumnPivot() const {
+          return primalColumnPivot_;
      }
      /// Returns true if model looks OK
@@ -972 +976 @@
           return valueOut_;
      }
+     /// Set value of out variable
+     inline void setValueOut(double value) {
+          valueOut_=value;
+     }
+     /// Set lower of out variable
+     inline void setLowerOut(double value) {
+          lowerOut_=value;
+     }
+     /// Set upper of out variable
+     inline void setUpperOut(double value) {
+          upperOut_=value;
+     }
+     /// Set theta of out variable
+     inline void setTheta(double value) {
+          theta_=value;
+     }
      /// Returns 1 if sequence indicates column
      inline int isColumn(int sequence) const {
@@ -1050 +1070 @@
          128 bit - no objective, 0-1 and in B&B
          256 bit - in primal from dual or vice versa
+         512 bit - alternative use of solveType_
      */
      inline int moreSpecialOptions() const {
@@ -1064 +1085 @@
          128 bit - no objective, 0-1 and in B&B
          256 bit - in primal from dual or vice versa
+         512 bit - alternative use of solveType_
      */
      inline void setMoreSpecialOptions(int value) {

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -2756 +2756 @@
           matrix_->extendUpdated(this, rowArray_[1], 0);
           // do ratio test and re-compute dj
-          primalRow(rowArray_[1], rowArray_[3], rowArray_[2],
+#ifdef CLP_USER_DRIVEN
+          if (solveType_!=2||(moreSpecialOptions_&512)==0) {
+#endif
+              primalRow(rowArray_[1], rowArray_[3], rowArray_[2],
                     ifValuesPass);
+#ifdef CLP_USER_DRIVEN
+          } else {
+              int status = eventHandler_->event(ClpEventHandler::pivotRow);
+              if (status>=0) {
+                  problemStatus_=5;
+                  secondaryStatus_=ClpEventHandler::pivotRow;
+                  break;
+              }
+          }
+#endif
           if (ifValuesPass) {
                saveDj = dualIn_;
@@ -2853 +2866 @@
           }
           if (pivotRow_ >= 0) {
-               if (solveType_ == 2) {
+               if (solveType_==2&&(moreSpecialOptions_&512)==0) {
                     // **** Coding for user interface
                     // do ray
@@ -2931 +2944 @@
                          clearAll();
                          pivotRow_ = -1;
-                         if (solveType_ == 1) {
+                         if (solveType_==1||(moreSpecialOptions_&512)!=0) {
                               returnCode = -4;
                               break;
@@ -2992 +3005 @@
                          // do ray
                          primalRay(rowArray_[1]);
-                    } else if (solveType_ == 2) {
+                    } else if (solveType_==2&&(moreSpecialOptions_&512)==0) {
                          // refactorize
                          int lastCleaned = 0;
@@ -3099 +3112 @@
           }
      }
-     if (solveType_ == 2 && (returnCode == -2 || returnCode == -3)) {
+     if ((solveType_==2&&(moreSpecialOptions_&512)==0)&&
+         (returnCode == -2||returnCode==-3)) {
           // refactorize here
           int lastCleaned = 0;