Changeset 1973 for stable


Ignore:
Timestamp:
Oct 19, 2013 11:59:44 AM (5 years ago)
Author:
stefan
Message:

merge r1971 from trunk: clone CbcModel? in CbcThread? instead of copy

Location:
stable/2.8/Cbc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/CbcModel.cpp

    r1950 r1973  
    55255525}
    55265526
     5527// Cloning method
     5528
     5529CbcModel *CbcModel::clone (bool cloneHandler) {
     5530  return new CbcModel (*this, cloneHandler);
     5531}
     5532
     5533
    55275534// Copy constructor.
    55285535
  • stable/2.8/Cbc/src/CbcModel.hpp

    r1902 r1973  
    19151915    */
    19161916    CbcModel(const CbcModel & rhs, bool cloneHandler = false);
     1917
     1918    /** Clone */
     1919    virtual CbcModel *clone (bool cloneHandler);
    19171920
    19181921    /// Assignment operator
  • stable/2.8/Cbc/src/CbcThread.cpp

    r1902 r1973  
    570570        model.setStrategy(NULL);
    571571        for (int i = 0; i < numberThreads_; i++) {
    572             threadModel_[i] = new CbcModel(model, true);
     572            //threadModel_[i] = new CbcModel(model, true);
     573            threadModel_[i] = model. clone (true);
    573574            threadModel_[i]->synchronizeHandlers(1);
    574575#ifdef COIN_HAS_CLP
Note: See TracChangeset for help on using the changeset viewer.