mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Since there is no a standard functions cv::min and cv::max which has cv::Scalar argument, removed the performance tests,

Browse Source 
calling the functions cv::min and cv::max with cv::Scalar argument.
Instead of them two performance tests were created which call the functions cv::min and cv::max with 'double' argument.
This commit is contained in:
Leonid Beynenson 2011-09-13 21:57:42 +00:00
parent a72da12c80
commit d99f4a2beb
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/perf/perf_core_arithm.cpp
View File

@ -59,8 +59,6 @@ PERF_TEST_P__CORE_ARITHM_SCALAR(bitwise_or, TYPICAL_MATS_BITW_ARITHM)
PERF_TEST_P__CORE_ARITHM_SCALAR(bitwise_xor, TYPICAL_MATS_BITW_ARITHM)
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(min, TYPICAL_MATS_CORE_ARITHM)
PERF_TEST_P__CORE_ARITHM_SCALAR(max, TYPICAL_MATS_CORE_ARITHM)
PERF_TEST_P__CORE_ARITHM_SCALAR(absdiff, TYPICAL_MATS_CORE_ARITHM)

39
modules/core/perf/perf_minmax.cpp Normal file
View File

@ -0,0 +1,39 @@
#include "perf_precomp.hpp"
using namespace std;
using namespace cv;
using namespace perf;
#define TYPICAL_MAT_SIZES_MINMAX TYPICAL_MAT_SIZES
#define TYPICAL_MAT_TYPES_MINMAX CV_8SC1, CV_8SC4, CV_32SC1, CV_32FC1
#define TYPICAL_MATS_MINMAX testing::Combine( testing::Values( TYPICAL_MAT_SIZES_MINMAX), testing::Values( TYPICAL_MAT_TYPES_MINMAX) )
PERF_TEST_P(Size_MatType, min_double, TYPICAL_MATS_MINMAX)
{
Size sz = std::tr1::get<0>(GetParam());
int type = std::tr1::get<1>(GetParam());
cv::Mat a = Mat(sz, type);
cv::Mat c = Mat(sz, type);
declare.in(a, ::perf::TestBase::WARMUP_RNG).out(c);
TEST_CYCLE(100) cv::min(a, 10, c);
SANITY_CHECK(c);
}
PERF_TEST_P(Size_MatType, max_double, TYPICAL_MATS_MINMAX)
{
Size sz = std::tr1::get<0>(GetParam());
int type = std::tr1::get<1>(GetParam());
cv::Mat a = Mat(sz, type);
cv::Mat c = Mat(sz, type);
declare.in(a, ::perf::TestBase::WARMUP_RNG).out(c);
TEST_CYCLE(100) cv::max(a, 10, c);
SANITY_CHECK(c);
}