Changeset 851

Timestamp:

Jan 7, 2008 8:10:35 AM (13 years ago)

Author:

forrest

Message:

better counts for global cuts

File:

• stable/2.0/Cbc/src/CbcModel.cpp (modified) (2 diffs)

stable/2.0/Cbc/src/CbcModel.cpp

@@ -5817 +5817 @@
           <<i
           <<generator_[i]->cutGeneratorName()
-          <<countRowCuts[i]<<count[i]
+          //<<countRowCuts[i]<<count[i]
+          << generator_[i]->numberCutsInTotal()<<generator_[i]->numberCutsActive()
           <<countColumnCuts[i];
         handler_->printing(!numberNodes_&&generator_[i]->timing())
@@ -7532 +7533 @@
                         globalCuts_.insert(newCut) ;
                         generator_[i]->incrementNumberCutsInTotal();
-                      }
+                    } else {
+                      // obviously wrong
+                      if (handler_->logLevel()>0)
+                        printf("Cut generator %s set to run on new solution but NOT globally valid!!\n",
+                               generator_[i]->cutGeneratorName());
+                    }
                   }
               }