Changeset 1532 for stable

Timestamp:

Mar 23, 2010 10:36:16 AM (11 years ago)

Author:

forrest

Message:

make it easier to play with alternative solutions

Location:

stable/1.11/Clp/src

Files:

• ClpEventHandler.hpp (modified) (1 diff)
• ClpSimplex.hpp (modified) (5 diffs)
• ClpSimplexPrimal.cpp (modified) (6 diffs)

stable/1.11/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.

stable/1.11/Clp/src/ClpSimplex.hpp

@@ -595 +595 @@
   inline CoinIndexedVector * columnArray(int index) const
   { return columnArray_[index];}
+  /// Sets firstFree_
+  inline void setFirstFree(int value)
+  { firstFree_=value;}
   //@}
 
@@ -618 +621 @@
                    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
   inline bool goodAccuracy() const
@@ -893 +899 @@
   inline double valueOut() const
   { 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
@@ -952 +970 @@
       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
@@ -965 +984 @@
       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)

stable/1.11/Clp/src/ClpSimplexPrimal.cpp

@@ -755 +755 @@
         int factorStatus = internalFactorize(1);
         if (factorStatus) {
-          if (solveType_==2+8) {
+          if (solveType_==2) {
             // say odd
             problemStatus_=5;
@@ -2755 +2755 @@
     matrix_->extendUpdated(this,rowArray_[1],0);
     // do ratio test and re-compute dj
-    primalRow(rowArray_[1],rowArray_[3],rowArray_[2],
-              ifValuesPass);
+#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_;
@@ -2847 +2860 @@
     }
     if (pivotRow_>=0) {
-      if (solveType_==2) {
+      if (solveType_==2&&(moreSpecialOptions_&512)==0) {
         // **** Coding for user interface
         // do ray
@@ -2925 +2938 @@
           clearAll();
           pivotRow_=-1;
-          if (solveType_==1) {
+          if (solveType_==1||(moreSpecialOptions_&512)!=0) {
             returnCode=-4;
             break;
@@ -2986 +2999 @@
           // do ray
           primalRay(rowArray_[1]);
-        } else if (solveType_==2) {
+        } else if (solveType_==2&&(moreSpecialOptions_&512)==0) {
           // refactorize
           int lastCleaned=0;
@@ -3093 +3106 @@
     }
   }
-  if (solveType_==2&&(returnCode == -2||returnCode==-3)) {
+  if ((solveType_==2&&(moreSpecialOptions_&512)==0)&&
+      (returnCode == -2||returnCode==-3)) {
     // refactorize here
     int lastCleaned=0;