Ignore:
Timestamp:
Jan 14, 2009 4:19:37 PM (12 years ago)
Author:
forrest
Message:

compiler warnings, deterministic parallel and stability

File:
1 edited

Legend:

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

    r1053 r1121  
    3838    mustCallAgain_(false),
    3939    switchedOff_(false),
     40    globalCutsAtRoot_(false),
    4041    timing_(false),
    4142    timeInCutGenerator_(0.0),
     
    6061    mustCallAgain_(false),
    6162    switchedOff_(false),
     63    globalCutsAtRoot_(false),
    6264    timing_(false),
    6365    timeInCutGenerator_(0.0),
     
    6971    numberActiveCutsAtRoot_(0)
    7072{
     73  if (howOften<-1000) {
     74    globalCutsAtRoot_=true;
     75    howOften+=1000;
     76  }
    7177  model_ = model;
    7278  generator_=generator->clone();
     
    101107  mustCallAgain_ = rhs.mustCallAgain_;
    102108  switchedOff_ = rhs.switchedOff_;
     109  globalCutsAtRoot_ = rhs.globalCutsAtRoot_;
    103110  timing_ = rhs.timing_;
    104111  timeInCutGenerator_ = rhs.timeInCutGenerator_;
     
    132139    mustCallAgain_ = rhs.mustCallAgain_;
    133140    switchedOff_ = rhs.switchedOff_;
     141    globalCutsAtRoot_ = rhs.globalCutsAtRoot_;
    134142    timing_ = rhs.timing_;
    135143    timeInCutGenerator_ = rhs.timeInCutGenerator_;
     
    232240    info.inTree = node!=NULL;
    233241    info.randomNumberGenerator=randomNumberGenerator;
     242    info.options=(globalCutsAtRoot_) ? 8 : 0;
    234243    incrementNumberTimesEntered();
    235244    CglProbing* generator =
     
    246255      bool doCuts=false;
    247256      if (info2&&!depth) {
     257        info2->options=(globalCutsAtRoot_) ? 8 : 0;
    248258        info2->level = depth;
    249259        info2->pass = pass;
     
    269279            2000123,
    270280            2099999};
    271           int n = (int) (sizeof(test)/sizeof(int));
     281          int n = static_cast<int> (sizeof(test)/sizeof(int));
    272282          int saveStack = generator->getMaxLook();
    273283          int saveNumber = generator->getMaxProbe();
Note: See TracChangeset for help on using the changeset viewer.