Changeset 2165

Timestamp:

Mar 17, 2015 4:58:35 AM (4 years ago)

Author:

forrest

Message:

try and fix segfault with threads when exiting

Location:

stable/2.9/Cbc/src

Files:

• CbcModel.cpp (modified) (2 diffs)
• CbcNode.cpp (modified) (2 diffs)

stable/2.9/Cbc/src/CbcModel.cpp

@@ -2089 +2089 @@
         }
         originalContinuousObjective_ = COIN_DBL_MAX;
+        if (bestSolution_ && 
+            ((specialOptions_&8388608)==0||(specialOptions_&2048)!=0)) {
+          // best solution found by various heuristics - set solution
+          char general[200];
+          sprintf(general,"Solution of %g already found by heuristic",
+                  bestObjective_);
+          messageHandler()->message(CBC_GENERAL,
+                                    messages())
+            << general << CoinMessageEol ;
+          setCutoff(1.0e50) ; // As best solution should be worse than cutoff
+          // change cutoff as constraint if wanted
+          if (cutoffRowNumber_>=0) {
+            if (solver_->getNumRows()>cutoffRowNumber_)
+              solver_->setRowUpper(cutoffRowNumber_,1.0e50);
+          }
+          // also in continuousSolver_
+          if (continuousSolver_) {
+            // Solvers know about direction
+            double direction = solver_->getObjSense();
+            continuousSolver_->setDblParam(OsiDualObjectiveLimit, 1.0e50*direction);
+          } else {
+            continuousSolver_ = solver_->clone();
+          }
+          phase_ = 5;
+          double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
+          if ((specialOptions_&4) == 0)
+            bestObjective_ += 100.0 * increment + 1.0e-3; // only set if we are going to solve
+          setBestSolution(CBC_END_SOLUTION, bestObjective_, bestSolution_, 1) ;
+          continuousSolver_->resolve() ;
+          if (!continuousSolver_->isProvenOptimal()) {
+            continuousSolver_->messageHandler()->setLogLevel(2) ;
+            continuousSolver_->initialSolve() ;
+          }
+          delete solver_ ;
+          solver_ = continuousSolver_ ;
+          setPointers(solver_);
+          continuousSolver_ = NULL ;
+        }
         solverCharacteristics_ = NULL;
         if (flipObjective)
@@ -4809 +4847 @@
             double dummyBest;
             tree_->cleanTree(this, -COIN_DBL_MAX, dummyBest) ;
-#ifdef CBC_THREAD
+#if 0 // Does not seem to be needed def CBC_THREAD
             if (parallelMode() > 0 && master_) {
               // see if any dangling nodes

stable/2.9/Cbc/src/CbcNode.cpp

@@ -2367 +2367 @@
                     }
                     delete [] rowActivity;
-                    delete [] solution;
                     if (!satisfied) {
 #ifdef CLP_INVESTIGATE
@@ -2394 +2393 @@
                         }
                     }
+                    delete [] solution;
                 }
             } else if (iPass == 1) {