Changeset 2200

Timestamp:

Jun 13, 2015 3:52:17 AM (6 years ago)

Author:

forrest

Message:

add changes from stable

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (14 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -1644 +1644 @@
     dblParam_[CbcLargestChange] = 0.0;
     intParam_[CbcNumberBranches] = 0;
+    double lastBestPossibleObjective=-COIN_DBL_MAX;
     // when to check for restart 
     int nextCheckRestart=50;
@@ -2452 +2453 @@
       that produced a given cut.
     */
-    maximumWhich_ = 1000 ;
+#define INITIAL_MAXIMUM_WHICH 1000
+    maximumWhich_ = INITIAL_MAXIMUM_WHICH ;
     delete [] whichGenerator_;
     whichGenerator_ = new int[maximumWhich_] ;
@@ -3615 +3617 @@
       // mark all cuts as globally valid
       int numberCuts=cuts.sizeRowCuts();
+      resizeWhichGenerator(0,numberCuts);
       for (int i=0;i<numberCuts;i++) {
         cuts.rowCutPtr(i)->setGloballyValid();
@@ -4654 +4657 @@
 #endif
             if (!intParam_[CbcPrinting]) {
+                // Parallel may not have any nodes
+                if (!nNodes) 
+                  bestPossibleObjective_ = lastBestPossibleObjective;
+                else
+                  lastBestPossibleObjective = bestPossibleObjective_;
                 messageHandler()->message(CBC_STATUS, messages())
-                << numberNodes_ << nNodes << bestObjective_ << bestPossibleObjective_
+                  << numberNodes_ << CoinMax(nNodes,1) << bestObjective_ << bestPossibleObjective_
                 << getCurrentSeconds()
                 << CoinMessageEol ;
@@ -5509 +5517 @@
         preferredWay_(0),
         currentPassNumber_(0),
-        maximumWhich_(1000),
+        maximumWhich_(INITIAL_MAXIMUM_WHICH),
         maximumRows_(0),
         randomSeed_(-1),
@@ -5679 +5687 @@
         preferredWay_(0),
         currentPassNumber_(0),
-        maximumWhich_(1000),
+        maximumWhich_(INITIAL_MAXIMUM_WHICH),
         maximumRows_(0),
         randomSeed_(-1),
@@ -7142 +7150 @@
         }
     }
+    resizeWhichGenerator(currentNumberCuts_,currentNumberCuts);
     currentNumberCuts_ = currentNumberCuts;
     if (currentNumberCuts > maximumNumberCuts_) {
@@ -7317 +7326 @@
             cutsToDrop = new int[currentNumberCuts] ;
             assert (currentNumberCuts + numberRowsAtContinuous_ <= lastws->getNumArtificial());
+#undef NDEBUG
+            assert (currentNumberCuts <= maximumWhich_); // we will read from whichGenerator_[0..currentNumberCuts-1] below, so should have all these entries
+            // the above assert fails in certain situations, which indicates a bug in the code below
+            // as a workaround, resize whichGenerator_ to make sure we can read all entries without an invalid read from valgrind (and subsequent crash somewhere, seems so)
             resizeWhichGenerator(maximumWhich_, currentNumberCuts);
             for (i = 0; i < currentNumberCuts; i++) {
@@ -7329 +7342 @@
                            numberRowsAtContinuous_ + numberToAdd);
 #         endif
+                    assert (i<maximumWhich_);
                     whichGenerator_[numberToAdd] = whichGenerator_[i];
                     addCuts[numberToAdd++] = addedCuts_[i];
@@ -7642 +7656 @@
 {
     if (numberAfter > maximumWhich_) {
-        maximumWhich_ = CoinMax(maximumWhich_ * 2 + 100, numberAfter) ;
+#define MAXIMUM_WHICH_INCREMENT 100
+#define MAXIMUM_WHICH_MULTIPLIER 2
+      //printf("maximumWhich from %d to %d (%d needed)\n",maximumWhich_,
+      //   CoinMax(maximumWhich_ * MAXIMUM_WHICH_MULTIPLIER + MAXIMUM_WHICH_INCREMENT, numberAfter),
+      //   numberAfter);
+        maximumWhich_ = CoinMax(maximumWhich_ * MAXIMUM_WHICH_MULTIPLIER + MAXIMUM_WHICH_INCREMENT, numberAfter) ;
+        //maximumWhich_ = numberAfter ;
         int * temp = new int[2*maximumWhich_] ;
         memcpy(temp, whichGenerator_, numberNow*sizeof(int)) ;
@@ -12495 +12515 @@
                 //OsiHintStrength saveStrength;
                 //bool savePrintHint;
-                //solver_->writeMps("infeas");
+                //solver_->writeMpsNative("infeas.mps", NULL, NULL, 2);
                 //bool gotHint = (solver_->getHintParam(OsiDoReducePrint,savePrintHint,saveStrength));
                 //gotHint = (solver_->getHintParam(OsiDoScale,saveTakeHint,saveStrength));
@@ -12724 +12744 @@
 #if CBC_FEASIBILITY_INVESTIGATE==0
                 }
+#else
+                solver_->writeMpsNative("BFeasible.mps",NULL,NULL,2);
 #endif
                 //if (fabs(objValue-objectiveValue)>1.0e-7*fabs(objectiveValue)) {
@@ -17914 +17936 @@
                 delete [] newSolution;
                 // Space for type of cuts
-                maximumWhich_ = 1000;
+                maximumWhich_ = INITIAL_MAXIMUM_WHICH;
                 delete [] whichGenerator_ ;
                 whichGenerator_ = new int[maximumWhich_];
@@ -18487 +18509 @@
       that produced a given cut.
     */
-    maximumWhich_ = 1000 ;
+    maximumWhich_ = INITIAL_MAXIMUM_WHICH ;
     delete [] whichGenerator_ ;
     whichGenerator_ = new int[maximumWhich_] ;