Changeset 814

Timestamp:

Oct 2, 2007 9:16:23 AM (14 years ago)

Author:

forrest

Message:

for more repeatable runs and OsiPseudoCost?

Location:

trunk/Cbc/src

Files:

• CbcCompareBase.hpp (modified) (3 diffs)
• CbcModel.cpp (modified) (7 diffs)

trunk/Cbc/src/CbcCompareBase.hpp

@@ -25 +25 @@
 public:
   // Default Constructor 
-  CbcCompareBase () {test_=NULL;}
+  CbcCompareBase () {test_=NULL;threaded_=false;}
 
   // This allows any method to change behavior as it is called
@@ -53 +53 @@
   // Copy constructor 
   CbcCompareBase ( const CbcCompareBase & rhs)
-  {test_=rhs.test_;}
+  {test_=rhs.test_;threaded_=rhs.threaded_;}
    
   // Assignment operator 
   CbcCompareBase & operator=( const CbcCompareBase& rhs)
-  {  if (this!=&rhs) {test_=rhs.test_;}
+  {  if (this!=&rhs) {test_=rhs.test_;threaded_=rhs.threaded_;}
   return *this;
   }
@@ -79 +79 @@
     assert (x);
     assert (y);
-#ifndef CBC_THREAD
-    CbcNodeInfo * infoX = x->nodeInfo();
-    assert (infoX);
-    int nodeNumberX = infoX->nodeNumber();
-    CbcNodeInfo * infoY = y->nodeInfo();
-    assert (infoY);
-    int nodeNumberY = infoY->nodeNumber();
-    assert (nodeNumberX!=nodeNumberY);
-    return (nodeNumberX>nodeNumberY);
-#else
-    // doesn't work if threaded
-    assert (x!=y);
-    return (x>y);
-#endif
+    if (!threaded_) {
+      CbcNodeInfo * infoX = x->nodeInfo();
+      assert (infoX);
+      int nodeNumberX = infoX->nodeNumber();
+      CbcNodeInfo * infoY = y->nodeInfo();
+      assert (infoY);
+      int nodeNumberY = infoY->nodeNumber();
+      assert (nodeNumberX!=nodeNumberY);
+      return (nodeNumberX>nodeNumberY);
+    } else {
+      // doesn't work if threaded
+      assert (x!=y);
+      return (x>y);
+    }
   }
+  /// Say threaded
+  inline void sayThreaded()
+  { threaded_ = true;}
 protected:
   CbcCompareBase * test_;
+  // If not threaded we can use better way to break ties
+  bool threaded_;
 };
 class CbcCompare {

trunk/Cbc/src/CbcModel.cpp

@@ -406 +406 @@
     int numberColumns = solver_->getNumCols() ;
     // Column copy of matrix
+    bool allPlusOnes=true;
+    bool allOnes=true;
+    int problemType=-1;
     const double * element = solver_->getMatrixByCol()->getElements();
     const int * row = solver_->getMatrixByCol()->getIndices();
@@ -441 +444 @@
           } else {
             rhs[iRow] = rowLower[iRow]-rhs[iRow];
+            if (problemType<0)
+              problemType=3; // set cover
+            else if (problemType!=3)
+              problemType=4;
           }
         } else {
           rhs[iRow] = rowUpper[iRow]-rhs[iRow];
+            if (problemType<0)
+              problemType=1; // set partitioning <=
+            else if (problemType!=1)
+              problemType=4;
         }
       } else {
         rhs[iRow] = rowUpper[iRow]-rhs[iRow];
-      }
+        if (problemType<0)
+          problemType=3; // set partitioning ==
+        else if (problemType!=2)
+          problemType=2;
+      }
+      if (fabs(rhs[iRow]-1.0)>1.0e-12)
+        problemType=4;
     }
     if (continuousMultiplier) {
@@ -460 +477 @@
           for (CoinBigIndex j=start;j<end;j++) {
             double value = element[j];
-            if (value!=1.0)
+            if (value==1.0) {
+            } else if (value==-1.0) {
               rhs[row[j]]=-0.5;
-            else if (value!=-1.0)
+              allPlusOnes=false;
+            } else {
               rhs[row[j]]=-COIN_DBL_MAX;
+              allOnes=false;
+            }
           }
         }
@@ -576 +597 @@
           }
         }
+      } else {
+        // all integer
+        problemType_= problemType;
+#ifdef COIN_DEVELOP
+        printf("Problem type is %d\n",problemType_);
+#endif
       }
     }
@@ -895 +922 @@
     eventHandler->setModel(this);
   // set up for probing
-  probingInfo_ = new CglTreeProbingInfo(solver_);
+  //probingInfo_ = new CglTreeProbingInfo(solver_);
+  probingInfo_=NULL;
 
   // Try for dominated columns
@@ -1548 +1576 @@
   // For now just one model
   if (numberThreads_) {
+    nodeCompare_->sayThreaded(); // need to use addresses
     threadId = new pthread_t [numberThreads_];
     threadCount = new int [numberThreads_];
@@ -4756 +4785 @@
         else
           value = value -floor(value);
+#if 1
+        OsiBranchingInformation usefulInfo=usefulInformation();
+        OsiHotInfo hotInfo(solver_,&usefulInfo,&object,0);
+        if (branch) {
+          hotInfo.setUpStatus(iStatus);
+          hotInfo.setUpChange(changeInObjective);
+          //object->setUpEstimate(value);
+        } else {
+          hotInfo.setDownStatus(iStatus);
+          hotInfo.setDownChange(changeInObjective);
+          //object->setDownEstimate(value);
+        }
+        branchingMethod_->chooseMethod()->updateInformation(&usefulInfo,branch,&hotInfo);
+#else
         branchingMethod_->chooseMethod()->updateInformation(iObject,branch,changeInObjective,
                                                             value,iStatus);
+#endif
       }
     }