Changeset 844 for stable/0.4


Ignore:
Timestamp:
Mar 26, 2012 11:57:50 AM (8 years ago)
Author:
pbelotti
Message:

merged changes from trunk:843 (bb time vs. total time)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/main/BonCouenne.cpp

    r795 r844  
    367367                     nr, nt, st,
    368368                     CoinCpuTime () - time_start,
    369                      cg ? (CoinCpuTime () - cg -> rootTime ()) : CoinCpuTime (),
     369                     cg ? (CoinCpuTime () - CoinMax (time_start, cg -> rootTime ())) : CoinCpuTime () - time_start,
    370370                     (lb < -9e12) ||
    371371                     (lb > COUENNE_INFINITY/1e4) ? "      -inf" : lbstr,
Note: See TracChangeset for help on using the changeset viewer.