Changeset 1004 for stable/2.1/Cbc/src/CbcModel.cpp
- Timestamp:
- Jul 15, 2008 12:02:38 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.1/Cbc/src/CbcModel.cpp
r1002 r1004 1842 1842 threadId[i].status =0; 1843 1843 threadInfo[i].baseModel=this; 1844 threadModel[i]=new CbcModel(*this );1844 threadModel[i]=new CbcModel(*this,true); 1845 1845 #ifdef COIN_HAS_CLP 1846 1846 // Solver may need to know about model … … 2994 2994 // delete models (here in case some point to others) 2995 2995 for (i=0;i<numberThreads_;i++) { 2996 // make sure handler will be deleted 2997 threadModel[i]->defaultHandler_=true; 2996 2998 delete threadModel[i]; 2997 2999 } … … 3852 3854 // Copy constructor. 3853 3855 3854 CbcModel::CbcModel(const CbcModel & rhs, bool noTree)3856 CbcModel::CbcModel(const CbcModel & rhs, bool cloneHandler) 3855 3857 : 3856 3858 continuousSolver_(NULL), … … 3929 3931 solverCharacteristics_ = NULL; 3930 3932 if (rhs.emptyWarmStart_) emptyWarmStart_ = rhs.emptyWarmStart_->clone() ; 3931 if (defaultHandler_) { 3933 bool noTree=false; 3934 if (defaultHandler_||cloneHandler) { 3932 3935 handler_ = new CoinMessageHandler(); 3933 3936 handler_->setLogLevel(2); … … 4113 4116 walkback_ = NULL; 4114 4117 synchronizeModel(); 4118 if (cloneHandler) { 4119 delete handler_; 4120 CoinMessageHandler * handler = rhs.handler_->clone(); 4121 passInMessageHandler(handler); 4122 } 4115 4123 } 4116 4124 … … 9683 9691 defaultHandler_=false; 9684 9692 handler_=handler; 9693 if (solver_) 9694 solver_->passInMessageHandler(handler); 9695 if (continuousSolver_) 9696 continuousSolver_->passInMessageHandler(handler); 9697 if (referenceSolver_) 9698 referenceSolver_->passInMessageHandler(handler); 9685 9699 } 9686 9700 void
Note: See TracChangeset
for help on using the changeset viewer.