Ignore:
Timestamp:
Jul 15, 2007 5:28:33 PM (12 years ago)
Author:
forrest
Message:

add threaded to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcMessage.cpp

    r640 r687  
    3131  {CBC_STATUS,10,1,"After %d nodes, %d on tree, %g best solution, best possible %g (%.2f seconds)"},
    3232  {CBC_GAP,11,1,"Exiting as integer gap of %g less than %g or %g%%"},
    33   {CBC_ROUNDING,12,1,"Integer solution of %g found by heuristic after %d iterations and %d nodes (%.2f seconds)"},
     33  {CBC_ROUNDING,12,1,"Integer solution of %g found by %s after %d iterations and %d nodes (%.2f seconds)"},
    3434  {CBC_TREE_SOL,24,1,"Integer solution of %g found by subtree after %d iterations and %d nodes (%.2f seconds)"},
    3535  {CBC_ROOT,13,1,"At root node, %d cuts changed objective from %g to %g in %d passes"},
     
    4949  {CBC_START_SUB,28,1,"Starting sub-tree for %s - maximum nodes %d"},
    5050  {CBC_END_SUB,29,1,"Ending sub-tree for %s"},
    51   {CBC_HEURISTIC_SOLUTION,30,1,"solution of %g found by %s after %2.f seconds"},
     51  {CBC_THREAD_STATS,30,1,"%s%? %d used %d times,  waiting to start %g, %?%g cpu time,%? %g waiting for threads, %? %d locks, %g locked, %g waiting for locks"},
    5252  {CBC_CUTS_STATS,31,1,"%d added rows had average density of %g"},
    5353  {CBC_STRONG_STATS,32,1,"Strong branching done %d times (%d iterations), fathomed %d nodes and fixed %d variables"},
     
    5656  {CBC_HEURISTICS_OFF,36,1,"Heuristics switched off as %d branching objects are of wrong type"},
    5757  {CBC_STATUS2,37,1,"%d nodes, %d on tree, best %g - possible %g depth %d unsat %d its %d (%.2f seconds)"},
     58  {CBC_FPUMP1,38,1,"%s"},
     59  {CBC_FPUMP2,39,2,"%s"},
    5860  {CBC_DUMMY_END,999999,0,""}
    5961};
Note: See TracChangeset for help on using the changeset viewer.