diff --git a/src/Config.h b/src/Config.h index 2de9d1ef..fa4e6f72 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 9 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 7 -#define VER_LAMEXP_BUILD 1448 +#define VER_LAMEXP_BUILD 1449 #define VER_LAMEXP_CONFG 1348 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 1770bc9d..f4ace8e6 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -395,13 +395,21 @@ void InitializationThread::runBenchmark(void) for(size_t c = 1; c <= maxThreads; c++) { - double delayAcc = 0.0; + QList delayLst; + double delayAvg = 0.0; for(size_t i = 0; i < nLoops; i++) { - delayAcc += doInit(c); + delayLst << doInit(c); lamexp_clean_all_tools(); } - results.insert(c, (delayAcc / double(nLoops))); + qSort(delayLst.begin(), delayLst.end()); + delayLst.takeLast(); + delayLst.takeFirst(); + for(QList::ConstIterator iter = delayLst.constBegin(); iter != delayLst.constEnd(); iter++) + { + delayAvg += (*iter); + } + results.insert(c, (delayAvg / double(delayLst.count()))); } qWarning("\n----------------------------------------------");