Ignore:
Timestamp:
Mar 23, 2011 8:19:59 PM (8 years ago)
Author:
tkr
Message:

Changing from CPU time limit to wallclock time limit for parallelism

File:
1 edited

Legend:

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

    r1605 r1621  
    15741574      Capture a time stamp before we start.
    15751575    */
    1576     dblParam_[CbcStartSeconds] = CoinCpuTime();
     1576    dblParam_[CbcStartSeconds] = CoinGetTimeOfDay();
    15771577    dblParam_[CbcSmallestChange] = COIN_DBL_MAX;
    15781578    dblParam_[CbcSumChange] = 0.0;
     
    38583858        masterThread_ = NULL;
    38593859        // adjust time to allow for children on some systems
    3860         dblParam_[CbcStartSeconds] -= CoinCpuTimeJustChildren();
     3860        //dblParam_[CbcStartSeconds] -= CoinCpuTimeJustChildren();
    38613861    }
    38623862#endif
     
    1218512185CbcModel::getCurrentSeconds() const
    1218612186{
    12187     return CoinCpuTime() - getDblParam(CbcStartSeconds);
     12187    return CoinGetTimeOfDay() - getDblParam(CbcStartSeconds);
    1218812188}
    1218912189/* Encapsulates choosing a variable -
Note: See TracChangeset for help on using the changeset viewer.