Changeset 1121 for trunk/Cbc/src/CbcCutGenerator.cpp

Timestamp:

Jan 14, 2009 4:19:37 PM (12 years ago)

Author:

forrest

Message:

compiler warnings, deterministic parallel and stability

File:

• trunk/Cbc/src/CbcCutGenerator.cpp (modified) (8 diffs)

trunk/Cbc/src/CbcCutGenerator.cpp

@@ -38 +38 @@
     mustCallAgain_(false),
     switchedOff_(false),
+    globalCutsAtRoot_(false),
     timing_(false),
     timeInCutGenerator_(0.0),
@@ -60 +61 @@
     mustCallAgain_(false),
     switchedOff_(false),
+    globalCutsAtRoot_(false),
     timing_(false),
     timeInCutGenerator_(0.0),
@@ -69 +71 @@
     numberActiveCutsAtRoot_(0)
 {
+  if (howOften<-1000) {
+    globalCutsAtRoot_=true;
+    howOften+=1000;
+  }
   model_ = model;
   generator_=generator->clone();
@@ -101 +107 @@
   mustCallAgain_ = rhs.mustCallAgain_;
   switchedOff_ = rhs.switchedOff_;
+  globalCutsAtRoot_ = rhs.globalCutsAtRoot_;
   timing_ = rhs.timing_;
   timeInCutGenerator_ = rhs.timeInCutGenerator_;
@@ -132 +139 @@
     mustCallAgain_ = rhs.mustCallAgain_;
     switchedOff_ = rhs.switchedOff_;
+    globalCutsAtRoot_ = rhs.globalCutsAtRoot_;
     timing_ = rhs.timing_;
     timeInCutGenerator_ = rhs.timeInCutGenerator_;
@@ -232 +240 @@
     info.inTree = node!=NULL;
     info.randomNumberGenerator=randomNumberGenerator;
+    info.options=(globalCutsAtRoot_) ? 8 : 0;
     incrementNumberTimesEntered();
     CglProbing* generator =
@@ -246 +255 @@
       bool doCuts=false;
       if (info2&&!depth) {
+        info2->options=(globalCutsAtRoot_) ? 8 : 0;
         info2->level = depth;
         info2->pass = pass;
@@ -269 +279 @@
             2000123,
             2099999};
-          int n = (int) (sizeof(test)/sizeof(int));
+          int n = static_cast<int> (sizeof(test)/sizeof(int));
           int saveStack = generator->getMaxLook();
           int saveNumber = generator->getMaxProbe();