Changeset 279


Ignore:
Timestamp:
Mar 17, 2006 8:36:40 AM (14 years ago)
Author:
forrest
Message:

for timing

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcHeuristicGreedy.cpp

    r202 r279  
    724724      model_->messageHandler()->message(CBC_HEURISTIC_SOLUTION,model_->messages())
    725725        << newSolutionValue
    726         << "CbcHeuristicGreedy"
     726        << "CbcHeuristicGreedy"<<model_->getCurrentSeconds()
    727727        <<CoinMessageEol;
    728728      returnCode=1;
  • trunk/CbcHeuristicLocal.cpp

    r197 r279  
    519519          model_->messageHandler()->message(CBC_HEURISTIC_SOLUTION,model_->messages())
    520520            << solutionValue
    521             << "CbcHeuristicLocal"
     521            << "CbcHeuristicLocal"<<model_->getCurrentSeconds()
    522522            <<CoinMessageEol;
    523523      } else {
  • trunk/CbcMessage.cpp

    r264 r279  
    1616static Cbc_message us_english[]=
    1717{
    18   {CBC_END_GOOD,1,1,"Search completed - best objective %g, took %d iterations and %d nodes"},
     18  {CBC_END_GOOD,1,1,"Search completed - best objective %g, took %d iterations and %d nodes (%.2f seconds)"},
    1919  {CBC_MAXNODES,3,1,"Exiting on maximum nodes"},
    2020  {CBC_MAXTIME,20,1,"Exiting on maximum time"},
    2121  {CBC_MAXSOLS,19,1,"Exiting on maximum solutions"},
    2222  {CBC_EVENT,27,1,"Exiting on user event"},
    23   {CBC_SOLUTION,4,1,"Integer solution of %g found after %d iterations and %d nodes"},
    24   {CBC_SOLUTION2,33,1,"Integer solution of %g found (by alternate solver) after %d iterations and %d nodes"},
    25   {CBC_END,5,1,"Partial search - best objective %g (best possible %g), took %d iterations and %d nodes"},
     23  {CBC_SOLUTION,4,1,"Integer solution of %g found after %d iterations and %d nodes (%.2f seconds)"},
     24  {CBC_END_SOLUTION,34,2,"Final check on integer solution of %g found after %d iterations and %d nodes (%.2f seconds)"},
     25  {CBC_SOLUTION2,33,1,"Integer solution of %g found (by alternate solver) after %d iterations and %d nodes (%.2f seconds)"},
     26  {CBC_END,5,1,"Partial search - best objective %g (best possible %g), took %d iterations and %d nodes (%.2f seconds)"},
    2627  {CBC_INFEAS,6,1,"The LP relaxation is infeasible or too expensive"},
    2728  {CBC_STRONG,7,3,"Strong branching on %d (%d), down %g (%d) up %g (%d) value %g"},
    2829  {CBC_SOLINDIVIDUAL,8,2,"%d has value %g"},
    2930  {CBC_INTEGERINCREMENT,9,1,"Objective coefficients multiple of %g"},
    30   {CBC_STATUS,10,1,"After %d nodes, %d on tree, %g best solution, best possible %g"},
     31  {CBC_STATUS,10,1,"After %d nodes, %d on tree, %g best solution, best possible %g (%.2f seconds)"},
    3132  {CBC_GAP,11,1,"Exiting as integer gap of %g less than %g or %g%%"},
    32   {CBC_ROUNDING,12,1,"Integer solution of %g found by heuristic after %d iterations and %d nodes"},
     33  {CBC_ROUNDING,12,1,"Integer solution of %g found by heuristic after %d iterations and %d nodes (%.2f seconds)"},
    3334  {CBC_ROOT,13,1,"At root node, %d cuts changed objective from %g to %g in %d passes"},
    3435  {CBC_GENERATOR,14,1,"Cut generator %d (%s) - %d row cuts (%d active), %d column cuts %? in %g seconds - new frequency is %d"},
    3536  {CBC_BRANCH,15,2,"Node %d Obj %g Unsat %d depth %d"},
    36   {CBC_STRONGSOL,16,1,"Integer solution of %g found by strong branching after %d iterations and %d nodes"},
    37   {CBC_TREE_SOL,24,1,"Integer solution of %g found by subtree after %d iterations and %d nodes"},
     37  {CBC_STRONGSOL,16,1,"Integer solution of %g found by strong branching after %d iterations and %d nodes (%.2f seconds)"},
     38  {CBC_TREE_SOL,24,1,"Integer solution of %g found by subtree after %d iterations and %d nodes (%.2f seconds)"},
    3839  {CBC_NOINT,3007,1,"No integer variables - nothing to do"},
    3940  {CBC_VUB_PASS,17,1,"%d solved, %d variables fixed, %d tightened"},
     
    4849  {CBC_START_SUB,28,1,"Starting sub-tree for %s - maximum nodes %d"},
    4950  {CBC_END_SUB,29,1,"Ending sub-tree for %s"},
    50   {CBC_HEURISTIC_SOLUTION,30,1,"solution of %g found by %s"},
     51  {CBC_HEURISTIC_SOLUTION,30,1,"solution of %g found by %s after %2.f seconds"},
    5152  {CBC_CUTS_STATS,31,1,"%d added rows had average density of %g"},
    5253  {CBC_STRONG_STATS,32,1,"Strong branching done %d times (%d iterations), fathomed %d nodes and fixed %d variables"},
  • trunk/include/CbcMessage.hpp

    r264 r279  
    2727  CBC_EVENT,
    2828  CBC_SOLUTION,
     29  CBC_END_SOLUTION,
    2930  CBC_SOLUTION2,
    3031  CBC_END,
  • trunk/include/CbcModel.hpp

    r277 r279  
    461461    return getDblParam(CbcMaximumSeconds);
    462462  }
     463  /// Current time since start of branchAndbound
     464  double getCurrentSeconds() const ;
    463465
    464466  /** Set the
Note: See TracChangeset for help on using the changeset viewer.