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

Merge pull request #26268 from mshabunin:cpp-array-test

Browse Source 
C-API cleanup: rework ArrayTest to use new arrays only
This commit is contained in:
Alexander Smorkalov 2024-10-14 11:14:10 +03:00 committed by GitHub
commit 3c627b0a97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 120 additions and 803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/3d/test/test_undistort.cpp
View File

@ -178,8 +178,8 @@ private:
int matrix_type;
static const int MAX_X = 2048;
static const int MAX_Y = 2048;
static const int MAX_X = 2000;
static const int MAX_Y = 2000;
};
CV_GetOptimalNewCameraMatrixNoDistortionTest::CV_GetOptimalNewCameraMatrixNoDistortionTest()

4
modules/core/test/test_dxt.cpp
View File

@ -797,7 +797,7 @@ double CxCore_MulSpectrumsTest::get_success_error_level( int test_case_idx, int
CV_UNUSED(test_case_idx);
CV_Assert(i == OUTPUT);
CV_Assert(j == 0);
int elem_depth = CV_MAT_DEPTH(cvGetElemType(test_array[i][j]));
const int elem_depth = test_mat[i][j].depth();
CV_Assert(elem_depth == CV_32F || elem_depth == CV_64F);
element_wise_relative_error = false;
@ -810,7 +810,7 @@ void CxCore_MulSpectrumsTest::run_func()
{
Mat& dst = !test_mat[TEMP].empty() && !test_mat[TEMP][0].empty() ?
test_mat[TEMP][0] : test_mat[OUTPUT][0];
const Mat* src1 = &test_mat[INPUT][0], *src2 = &test_mat[INPUT][1];
Mat *src1 = &test_mat[INPUT][0], *src2 = &test_mat[INPUT][1];
if( inplace )
{

807
modules/core/test/test_math.cpp
View File

File diff suppressed because it is too large Load Diff

29
modules/ts/include/opencv2/ts.hpp
View File

@ -666,8 +666,6 @@ protected:
virtual void get_minmax_bounds( int i, int j, int type, Scalar& low, Scalar& high );
virtual double get_success_error_level( int test_case_idx, int i, int j );
bool cvmat_allowed;
bool iplimage_allowed;
bool optional_mask;
bool element_wise_relative_error;
@ -676,8 +674,31 @@ protected:
enum { INPUT, INPUT_OUTPUT, OUTPUT, REF_INPUT_OUTPUT, REF_OUTPUT, TEMP, MASK, MAX_ARR };
vector<vector<void*> > test_array;
vector<vector<Mat> > test_mat;
// Helper classes to proxy specific calls to test_mat array, emulates vector<vector<void*>>
// allowed calls:
// test_array.size() - always MAX_ARR
// test_array[i].size()
// test_array[i].push_back(NULL) - only NULL is supported
// test_array[i].pop_back()
struct ProxyAccessor {
ProxyAccessor(ArrayTest & parent_, size_t idx_) : parent(parent_), idx(idx_) {}
inline void push_back(void * ptr) const { CV_Assert(ptr == NULL); parent.test_mat[idx].push_back(Mat()); }
inline void pop_back() const { CV_Assert(parent.test_mat[idx].size() > 0); parent.test_mat[idx].pop_back(); }
inline size_t size() const { return parent.test_mat[idx].size(); }
private:
ArrayTest &parent;
size_t idx;
};
struct ProxyInterface {
ProxyInterface(ArrayTest & parent_) : parent(parent_) {}
inline ProxyAccessor operator[](size_t idx) const { return ProxyAccessor(parent, idx); }
inline size_t size() const { return MAX_ARR; }
private:
ArrayTest &parent;
};
ProxyInterface test_array; // former vector<vector<void*> > test_array;
std::vector<std::vector<cv::Mat> > test_mat;
float buf[4];
};

79
modules/ts/src/ts_arrtest.cpp
View File

@ -40,7 +40,6 @@
//M*/
#include "precomp.hpp"
#include "opencv2/core/core_c.h"
namespace cvtest
{
@ -48,18 +47,16 @@ namespace cvtest
static const int default_test_case_count = 500;
static const int default_max_log_array_size = 9;
ArrayTest::ArrayTest()
ArrayTest::ArrayTest() : test_array(*this)
{
test_case_count = default_test_case_count;
iplimage_allowed = true;
cvmat_allowed = true;
optional_mask = false;
min_log_array_size = 0;
max_log_array_size = default_max_log_array_size;
element_wise_relative_error = true;
test_array.resize(MAX_ARR);
test_mat.resize(MAX_ARR);
}
@ -71,11 +68,6 @@ ArrayTest::~ArrayTest()
void ArrayTest::clear()
{
for( size_t i = 0; i < test_array.size(); i++ )
{
for( size_t j = 0; j < test_array[i].size(); j++ )
cvRelease( &test_array[i][j] );
}
BaseTest::clear();
}
@ -122,14 +114,6 @@ void ArrayTest::get_test_array_types_and_sizes( int /*test_case_idx*/, vector<ve
}
}
static const unsigned int icvTsTypeToDepth[] =
{
IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16U, IPL_DEPTH_16S,
IPL_DEPTH_32S, IPL_DEPTH_32F, IPL_DEPTH_64F
};
int ArrayTest::prepare_test_case( int test_case_idx )
{
int code = 1;
@ -139,7 +123,6 @@ int ArrayTest::prepare_test_case( int test_case_idx )
vector<vector<int> > types(max_arr);
size_t i, j;
RNG& rng = ts->get_rng();
bool is_image = false;
for( i = 0; i < max_arr; i++ )
{
@ -158,10 +141,9 @@ int ArrayTest::prepare_test_case( int test_case_idx )
{
unsigned t = randInt(rng);
bool create_mask = true, use_roi = false;
CvSize size = cvSize(sizes[i][j]), whole_size = size;
CvRect roi = CV_STRUCT_INITIALIZER;
Size size(sizes[i][j]), whole_size = size;
Rect roi(0, 0, 0, 0);
is_image = !cvmat_allowed ? true : iplimage_allowed ? (t & 1) != 0 : false;
create_mask = (t & 6) == 0; // ~ each of 3 tests will use mask
use_roi = (t & 8) != 0;
if( use_roi )
@ -170,7 +152,6 @@ int ArrayTest::prepare_test_case( int test_case_idx )
whole_size.height += randInt(rng) % 10;
}
cvRelease( &test_array[i][j] );
if( size.width > 0 && size.height > 0 &&
types[i][j] >= 0 && (i != MASK || create_mask) )
{
@ -184,43 +165,28 @@ int ArrayTest::prepare_test_case( int test_case_idx )
if( whole_size.height > size.height )
roi.y = randInt(rng) % (whole_size.height - size.height);
}
if( is_image )
if( use_roi )
{
test_array[i][j] = cvCreateImage( whole_size,
icvTsTypeToDepth[CV_MAT_DEPTH(types[i][j])], CV_MAT_CN(types[i][j]) );
if( use_roi )
cvSetImageROI( (IplImage*)test_array[i][j], roi );
// TODO: re-enable actual ROI selection
// test_mat[i][j] = test_mat[i][j](roi);
// Size sz;
// Point ofs;
// test_mat[i][j].locateROI(sz, ofs);
test_mat[i][j].create(roi.size(), types[i][j]);
}
else
{
test_array[i][j] = cvCreateMat( whole_size.height, whole_size.width, types[i][j] );
if( use_roi )
{
CvMat submat, *mat = (CvMat*)test_array[i][j];
cvGetSubRect( test_array[i][j], &submat, roi );
submat.refcount = mat->refcount;
*mat = submat;
}
test_mat[i][j].create(whole_size, types[i][j]);
}
}
}
}
test_mat.resize(test_array.size());
for( i = 0; i < max_arr; i++ )
{
size_t sizei = test_array[i].size();
test_mat[i].resize(sizei);
for( j = 0; j < sizei; j++ )
{
CvArr* arr = test_array[i][j];
test_mat[i][j] = cv::cvarrToMat(arr);
else
{
test_mat[i][j].create(Size(), CV_8U);
}
if( !test_mat[i][j].empty() )
fill_array( test_case_idx, (int)i, (int)j, test_mat[i][j] );
}
}
return code;
}
@ -267,7 +233,7 @@ void ArrayTest::fill_array( int /*test_case_idx*/, int i, int j, Mat& arr )
double ArrayTest::get_success_error_level( int /*test_case_idx*/, int i, int j )
{
int elem_depth = CV_MAT_DEPTH(cvGetElemType(test_array[i][j]));
const int elem_depth = test_mat[i][j].depth();
CV_Assert( i == OUTPUT || i == INPUT_OUTPUT );
return elem_depth < CV_32F ? 0 : elem_depth == CV_32F ? FLT_EPSILON*100: DBL_EPSILON*5000;
}
@ -291,15 +257,15 @@ int ArrayTest::validate_test_results( int test_case_idx )
{
int i0 = i == 0 ? OUTPUT : INPUT_OUTPUT;
int i1 = i == 0 ? REF_OUTPUT : REF_INPUT_OUTPUT;
size_t sizei = test_array[i0].size();
size_t sizei = test_mat[i0].size();
CV_Assert( sizei == test_array[i1].size() );
CV_Assert( sizei == test_mat[i1].size() );
for( j = 0; j < sizei; j++ )
{
double err_level;
int code;
if( !test_array[i1][j] )
if( test_mat[i1][j].empty() )
continue;
err_level = get_success_error_level( test_case_idx, i0, (int)j );
@ -307,9 +273,10 @@ int ArrayTest::validate_test_results( int test_case_idx )
if (code == 0) continue;
for( i0 = 0; i0 < (int)test_array.size(); i0++ )
for( i0 = 0; i0 < (int)test_mat.size(); i0++ )
{
size_t sizei0 = test_array[i0].size();
size_t sizei0 = test_mat[i0].size();
if( i0 == REF_INPUT_OUTPUT || i0 == OUTPUT || i0 == TEMP )
continue;
for( i1 = 0; i1 < (int)sizei0; i1++ )