From 20af242a0374ec3d9e674f6a4dfffecf8c6d3c29 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 3 Oct 2011 07:43:57 +0000 Subject: [PATCH] Updated command line arguments in performance tests --- modules/core/perf/perf_core_arithm.cpp | 4 ++-- modules/ts/src/ts_perf.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/core/perf/perf_core_arithm.cpp b/modules/core/perf/perf_core_arithm.cpp index 7e48ca715..695cad383 100644 --- a/modules/core/perf/perf_core_arithm.cpp +++ b/modules/core/perf/perf_core_arithm.cpp @@ -61,7 +61,7 @@ PERF_TEST_P__CORE_ARITHM_SCALAR(add, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P__CORE_ARITHM_SCALAR(subtract, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P__CORE_ARITHM_SCALAR(absdiff, TYPICAL_MATS_CORE_ARITHM) - +#ifdef ANDROID PERF_TEST(convert, cvRound) { double number = theRNG().uniform(-100, 100); @@ -74,4 +74,4 @@ PERF_TEST(convert, cvRound) result += cvRound(number); } } - +#endif diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp index 145de3b13..30be6303f 100644 --- a/modules/ts/src/ts_perf.cpp +++ b/modules/ts/src/ts_perf.cpp @@ -382,17 +382,17 @@ int64 TestBase::_timeadjustment = 0; const char *command_line_keys = { - "{!!bugbugbugbug!! |perf_max_outliers |8 |percent of allowed outliers}" - "{!!bugbugbugbug!! |perf_min_samples |10 |minimal required numer of samples}" - "{!!bugbugbugbug!! |perf_seed |809564 |seed for random numbers generator}" + "{ |perf_max_outliers |8 |percent of allowed outliers}" + "{ |perf_min_samples |10 |minimal required numer of samples}" + "{ |perf_seed |809564 |seed for random numbers generator}" #if ANDROID - "{!!bugbugbugbug!! |perf_time_limit |6.0 |default time limit for a single test (in seconds)}" - "{!!bugbugbugbug!! |perf_affinity_mask |0 |set affinity mask for the main thread}" + "{ |perf_time_limit |6.0 |default time limit for a single test (in seconds)}" + "{ |perf_affinity_mask |0 |set affinity mask for the main thread}" #else - "{!!bugbugbugbug!! |perf_time_limit |3.0 |default time limit for a single test (in seconds)}" + "{ |perf_time_limit |3.0 |default time limit for a single test (in seconds)}" #endif - "{!!bugbugbugbug!! |perf_max_deviation |1.0 |}" - "{h |help |false |}" + "{ |perf_max_deviation |1.0 |}" + "{h |help |false |}" }; double param_max_outliers;