Changeset 1972


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

merge r1971 from trunk: change for pietro to clone cbcmodel in cbcthreads instead of copy

Location:
stable/2.7
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7

    • Property svn:mergeinfo changed
      /trunkmerged: 1971
  • stable/2.7/Cbc

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

    r1833 r1972  
    48804880    return ;
    48814881}
     4882
     4883// Cloning method
     4884
     4885CbcModel *CbcModel::clone (bool cloneHandler) {
     4886  return new CbcModel (*this, cloneHandler);
     4887}
     4888
    48824889
    48834890// Copy constructor.
  • stable/2.7/Cbc/src/CbcModel.hpp

    r1795 r1972  
    18371837    */
    18381838    CbcModel(const CbcModel & rhs, bool cloneHandler = false);
     1839
     1840    /** Clone */
     1841    virtual CbcModel *clone (bool cloneHandler);
    18391842
    18401843    /// Assignment operator
  • stable/2.7/Cbc/src/CbcThread.cpp

    r1817 r1972  
    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.