Changeset 937 for trunk/Cbc/src/CbcModel.cpp

Timestamp:

May 8, 2008 10:41:18 AM (13 years ago)

Author:

forrest

Message:

allow user more control over when cut generators called

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (3 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -5904 +5904 @@
     int i;
     if ((threadMode_&2)==0||numberNodes_) {
-      int nGen = numberCutGenerators_;
-      if (node&&node->depth()>10&&(node->depth()&1)==0&&!fullScan)
-        nGen=0;
 # ifdef COIN_HAS_CLP
       if (!node&&!parentModel_&& intParam_[CbcMaxNumNode] == -123456) {
@@ -5916 +5913 @@
       }
 # endif
-      for (i = 0;i<nGen;i++) {
+      for (i = 0;i<numberCutGenerators_;i++) {
         int numberRowCutsBefore = theseCuts.sizeRowCuts() ;
         int numberColumnCutsBefore = theseCuts.sizeColCuts() ;
@@ -5929 +5926 @@
         if (generator_[i]->switchedOff())
           generate=false;;
+        if (node&&node->depth()>10&&(node->depth()&1)==0&&!fullScan) {
+          // switch off if default
+          if (generator_[i]->howOften()==1&&generator_[i]->whatDepth()<0)
+            generate=false;
+        }
         if (generate) {
           bool mustResolve =