Changeset 2492


Ignore:
Timestamp:
Feb 15, 2019 5:59:17 AM (2 months ago)
Author:
forrest
Message:

don't allow restart if off objects

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.cpp

    r2491 r2492  
    20332033        numberOdd++;
    20342034    }
    2035     if (numberOdd)
     2035    if (numberOdd) {
    20362036      moreSpecialOptions_ |= 1073741824;
     2037      // also switch off checking for restart (as preprocessing may be odd)
     2038      specialOptions_ &= ~(512|32768);
     2039    }
    20372040  }
    20382041  // If NLP then we assume already solved outside branchAndbound
     
    55895592  , fastNodeDepth_(-1)
    55905593  , eventHandler_(NULL)
    5591   ,
    55925594#ifdef COIN_HAS_NTY
    5593   symmetryInfo_(NULL)
    5594   ,
    5595 #endif
    5596   numberObjects_(0)
     5595  , symmetryInfo_(NULL)
     5596#endif
     5597  , numberObjects_(0)
    55975598  , object_(NULL)
    55985599  , ownObjects_(true)
     
    56435644  , master_(NULL)
    56445645  , masterThread_(NULL)
    5645   , keepNamesPreproc(false)
    56465646{
    56475647  memset(intParam_, 0, sizeof(intParam_));
     
    56655665  strongInfo_[5] = 0;
    56665666  strongInfo_[6] = 0;
     5667  keepNamesPreproc = false;
    56675668  solverCharacteristics_ = NULL;
    56685669  nodeCompare_ = new CbcCompareDefault();
    5669   ;
    56705670  problemFeasibility_ = new CbcFeasibilityBase();
    56715671  tree_ = new CbcTree();
     
    57635763  , fastNodeDepth_(-1)
    57645764  , eventHandler_(NULL)
    5765   ,
    57665765#ifdef COIN_HAS_NTY
    5767   symmetryInfo_(NULL)
    5768   ,
    5769 #endif
    5770   numberObjects_(0)
     5766  , symmetryInfo_(NULL)
     5767#endif
     5768  , numberObjects_(0)
    57715769  , object_(NULL)
    57725770  , ownObjects_(true)
     
    58175815  , master_(NULL)
    58185816  , masterThread_(NULL)
    5819   , keepNamesPreproc(false)
    58205817{
    58215818  memset(intParam_, 0, sizeof(intParam_));
     
    58405837  strongInfo_[6] = 0;
    58415838  solverCharacteristics_ = NULL;
     5839  keepNamesPreproc = false;
    58425840  nodeCompare_ = new CbcCompareDefault();
    5843   ;
    58445841  problemFeasibility_ = new CbcFeasibilityBase();
    58455842  tree_ = new CbcTree();
     
    61046101  , master_(NULL)
    61056102  , masterThread_(NULL)
    6106   , keepNamesPreproc(rhs.keepNamesPreproc)
    61076103{
    61086104  memcpy(intParam_, rhs.intParam_, sizeof(intParam_));
     
    61156111  strongInfo_[5] = rhs.strongInfo_[5];
    61166112  strongInfo_[6] = rhs.strongInfo_[6];
     6113  keepNamesPreproc = rhs.keepNamesPreproc;
    61176114  solverCharacteristics_ = NULL;
    61186115  if (rhs.emptyWarmStart_)
Note: See TracChangeset for help on using the changeset viewer.