Changeset 67

Timestamp:

Feb 25, 2005 3:57:10 PM (16 years ago)

Author:

forrest

Message:

modify message

Location:

trunk

Files:

• CbcMessage.cpp (modified) (1 diff)
• CbcModel.cpp (modified) (1 diff)

trunk/CbcMessage.cpp

@@ -30 +30 @@
   {CBC_ROUNDING,12,1,"Integer solution of %g found by heuristic after %d iterations and %d nodes"},
   {CBC_ROOT,13,1,"At root node, %d cuts changed objective from %g to %g in %d passes"},
-  {CBC_GENERATOR,14,1,"Cut generator %d (%s) - %d row cuts (%d active), %d column cuts - new frequency is %d"},
+  {CBC_GENERATOR,14,1,"Cut generator %d (%s) - %d row cuts (%d active), %d column cuts %? in %g seconds - new frequency is %d"},
   {CBC_BRANCH,15,2,"Node %d Obj %g Unsat %d depth %d"},
   {CBC_STRONGSOL,16,1,"Integer solution of %g found by strong branching after %d iterations and %d nodes"},

trunk/CbcModel.cpp

@@ -2912 +2912 @@
       generator_[i]->incrementNumberCutsInTotal(countRowCuts[i]);
       generator_[i]->incrementNumberCutsActive(count[i]);
-      if (handler_->logLevel()>1||!numberNodes_)
+      if (handler_->logLevel()>1||!numberNodes_) {
         handler_->message(CBC_GENERATOR,messages_)
           <<i
           <<generator_[i]->cutGeneratorName()
           <<countRowCuts[i]<<count[i]
-          <<countColumnCuts[i]
+          <<countColumnCuts[i];
+        handler_->printing(!numberNodes_&&generator_[i]->timing())
+          <<generator_[i]->timeInCutGenerator();
+        handler_->message()
           <<newFrequency
           <<CoinMessageEol ;
+      }
     } 
     delete [] count ;