Changeset 1004 for stable/2.1/Cbc/src/CbcModel.cpp

Timestamp:

Jul 15, 2008 12:02:38 PM (13 years ago)

Author:

forrest

Message:

for threadsafe messages

File:

• stable/2.1/Cbc/src/CbcModel.cpp (modified) (6 diffs)

stable/2.1/Cbc/src/CbcModel.cpp

@@ -1842 +1842 @@
       threadId[i].status =0;
       threadInfo[i].baseModel=this;
-      threadModel[i]=new CbcModel(*this);
+      threadModel[i]=new CbcModel(*this,true);
 #ifdef COIN_HAS_CLP
       // Solver may need to know about model
@@ -2994 +2994 @@
     // delete models (here in case some point to others)
     for (i=0;i<numberThreads_;i++) {
+      // make sure handler will be deleted
+      threadModel[i]->defaultHandler_=true;
       delete threadModel[i];
     }
@@ -3852 +3854 @@
 // Copy constructor.
 
-CbcModel::CbcModel(const CbcModel & rhs, bool noTree)
+CbcModel::CbcModel(const CbcModel & rhs, bool cloneHandler)
 :
   continuousSolver_(NULL),
@@ -3929 +3931 @@
   solverCharacteristics_ = NULL;
   if (rhs.emptyWarmStart_) emptyWarmStart_ = rhs.emptyWarmStart_->clone() ;
-  if (defaultHandler_) {
+  bool noTree=false;
+  if (defaultHandler_||cloneHandler) {
     handler_ = new CoinMessageHandler();
     handler_->setLogLevel(2);
@@ -4113 +4116 @@
     walkback_ = NULL;
   synchronizeModel();
+  if (cloneHandler) {
+    delete handler_;
+    CoinMessageHandler * handler = rhs.handler_->clone();
+    passInMessageHandler(handler);
+  }
 }
   
@@ -9683 +9691 @@
   defaultHandler_=false;
   handler_=handler;
+  if (solver_)
+    solver_->passInMessageHandler(handler);
+  if (continuousSolver_)
+    continuousSolver_->passInMessageHandler(handler);
+  if (referenceSolver_)
+    referenceSolver_->passInMessageHandler(handler);
 }
 void