Changeset 67


Ignore:
Timestamp:
Feb 25, 2005 3:57:10 PM (16 years ago)
Author:
forrest
Message:

modify message

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcMessage.cpp

    r54 r67  
    3030  {CBC_ROUNDING,12,1,"Integer solution of %g found by heuristic after %d iterations and %d nodes"},
    3131  {CBC_ROOT,13,1,"At root node, %d cuts changed objective from %g to %g in %d passes"},
    32   {CBC_GENERATOR,14,1,"Cut generator %d (%s) - %d row cuts (%d active), %d column cuts - new frequency is %d"},
     32  {CBC_GENERATOR,14,1,"Cut generator %d (%s) - %d row cuts (%d active), %d column cuts %? in %g seconds - new frequency is %d"},
    3333  {CBC_BRANCH,15,2,"Node %d Obj %g Unsat %d depth %d"},
    3434  {CBC_STRONGSOL,16,1,"Integer solution of %g found by strong branching after %d iterations and %d nodes"},
  • trunk/CbcModel.cpp

    r66 r67  
    29122912      generator_[i]->incrementNumberCutsInTotal(countRowCuts[i]);
    29132913      generator_[i]->incrementNumberCutsActive(count[i]);
    2914       if (handler_->logLevel()>1||!numberNodes_)
     2914      if (handler_->logLevel()>1||!numberNodes_) {
    29152915        handler_->message(CBC_GENERATOR,messages_)
    29162916          <<i
    29172917          <<generator_[i]->cutGeneratorName()
    29182918          <<countRowCuts[i]<<count[i]
    2919           <<countColumnCuts[i]
     2919          <<countColumnCuts[i];
     2920        handler_->printing(!numberNodes_&&generator_[i]->timing())
     2921          <<generator_[i]->timeInCutGenerator();
     2922        handler_->message()
    29202923          <<newFrequency
    29212924          <<CoinMessageEol ;
     2925      }
    29222926    }
    29232927    delete [] count ;
Note: See TracChangeset for help on using the changeset viewer.