Skip to content

O
opencv
Commit 07fa62f0 authored by Alexander Reshetnikov's avatar Alexander Reshetnikov
Browse files
Options

some design code changes in new tests

parent ea5d0155
Show whitespace changes
Inline Side-by-side
Showing with 138 additions and 568 deletions
modules/calib3d/test/test_homography.cpp
View file @ 07fa62f0
...@@ -30,40 +30,23 @@ using namespace std; ...@@ -30,40 +30,23 @@ using namespace std;
class CV_HomographyTest: public cvtest::ArrayTest class CV_HomographyTest: public cvtest::ArrayTest
{ {
public: public:
CV_HomographyTest(); CV_HomographyTest();
~CV_HomographyTest(); ~CV_HomographyTest();
int read_params( CvFileStorage* fs );
void fill_array( int test_case_idx, int i, int j, Mat& arr );
int prepare_test_case( int test_case_idx );
void get_test_array_types_and_sizes( int test_case_idx, vector<vector<Size> >& sizes, vector<vector<int> >& types );
void run (int); void run (int);
bool check_matrix (const Mat& H); protected:
bool check_transform (const Mat& src, const Mat& dst, const Mat& H);
void prepare_to_validation( int test_case_idx );
protected:
int method; int method;
int image_size; int image_size;
int square_size;
double reproj_threshold; double reproj_threshold;
double sigma; double sigma;
bool test_cpp;
double get_success_error_level( int test_case_idx, int i, int j );
void test_projectPoints(Mat& src_2d, Mat& dst_2d, const Mat& H, RNG* rng, double sigma); // checking for quality of perpective transformation
private: private:
float max_diff, max_2diff; float max_diff, max_2diff;
bool check_matrix_size(const cv::Mat& H); bool check_matrix_size(const cv::Mat& H);
bool check_matrix_diff(const cv::Mat& original, const cv::Mat& found, const int norm_type, double &diff); bool check_matrix_diff(const cv::Mat& original, const cv::Mat& found, const int norm_type, double &diff);
// bool check_reproj_error(const cv::Mat& src_3d, const cv::Mat& dst_3d, const int norm_type = NORM_L2);
int check_ransac_mask_1(const Mat& src, const Mat& mask); int check_ransac_mask_1(const Mat& src, const Mat& mask);
int check_ransac_mask_2(const Mat& original_mask, const Mat& found_mask); int check_ransac_mask_2(const Mat& original_mask, const Mat& found_mask);
...@@ -75,464 +58,18 @@ class CV_HomographyTest: public cvtest::ArrayTest ...@@ -75,464 +58,18 @@ class CV_HomographyTest: public cvtest::ArrayTest
void print_information_6(int j, int N, int k, double diff, bool value); void print_information_6(int j, int N, int k, double diff, bool value);
void print_information_7(int j, int N, int k, double diff, bool original_value, bool found_value); void print_information_7(int j, int N, int k, double diff, bool original_value, bool found_value);
void print_information_8(int j, int N, int k, int l, double diff); void print_information_8(int j, int N, int k, int l, double diff);
void check_transform_quality(cv::InputArray src_points, cv::InputArray dst_poits, const cv::Mat& H, const int norm_type = NORM_L2);
void check_transform_quality(const cv::InputArray src_points, const vector <cv::Point2f> dst_points, const cv::Mat& H, const int norm_type = NORM_L2);
void check_transform_quality(const vector <cv::Point2f> src_points, const cv::InputArray dst_points, const cv::Mat& H, const int norm_type = NORM_L2);
void check_transform_quality(const vector <cv::Point2f> src_points, const vector <cv::Point2f> dst_points, const cv::Mat& H, const int norm_type = NORM_L2);
}; };
CV_HomographyTest::CV_HomographyTest() : max_diff(1e-2), max_2diff(2e-2) CV_HomographyTest::CV_HomographyTest() : max_diff(1e-2), max_2diff(2e-2)
{ {
test_array[INPUT].push_back(NULL);
test_array[INPUT].push_back(NULL);
test_array[INPUT].push_back(NULL);
test_array[INPUT].push_back(NULL);
test_array[INPUT].push_back(NULL);
test_array[INPUT].push_back(NULL);
test_array[TEMP].push_back(NULL);
test_array[TEMP].push_back(NULL);
test_array[OUTPUT].push_back(NULL);
test_array[OUTPUT].push_back(NULL);
test_array[REF_OUTPUT].push_back(NULL);
test_array[REF_OUTPUT].push_back(NULL);
element_wise_relative_error = false;
method = 0; method = 0;
image_size = 1e+2; image_size = 1e+2;
reproj_threshold = 3.0; reproj_threshold = 3.0;
sigma = 0.01; sigma = 0.01;
test_cpp = false;
} }
CV_HomographyTest::~CV_HomographyTest() {} CV_HomographyTest::~CV_HomographyTest() {}
void CV_HomographyTest::get_test_array_types_and_sizes( int /*test_case_idx*/, vector<vector<Size> >& sizes, vector<vector<int> >& types )
{
RNG& rng = ts->get_rng();
int pt_depth = CV_32F;
double pt_count_exp = cvtest::randReal(rng)*6 + 1;
int pt_count = cvRound(exp(pt_count_exp));
/* dims = cvtest::randInt(rng) % 2 + 2;
method = 1 << (cvtest::randInt(rng) % 4);
if( method == CV_FM_7POINT )
pt_count = 7;
else
{
pt_count = MAX( pt_count, 8 + (method == CV_FM_8POINT) );
if( pt_count >= 8 && cvtest::randInt(rng) % 2 )
method |= CV_FM_8POINT;
} */
types[INPUT][0] = CV_MAKETYPE(pt_depth, 2);
types[INPUT][1] = types[INPUT][0];
types[OUTPUT][0] = CV_MAKETYPE(pt_depth, 1);
/* if( cvtest::randInt(rng) % 2 )
sizes[INPUT][0] = cvSize(pt_count, dims);
else
{
sizes[INPUT][0] = cvSize(dims, pt_count);
if( cvtest::randInt(rng) % 2 )
{
types[INPUT][0] = CV_MAKETYPE(pt_depth, dims);
if( cvtest::randInt(rng) % 2 )
sizes[INPUT][0] = cvSize(pt_count, 1);
else
sizes[INPUT][0] = cvSize(1, pt_count);
}
}
sizes[INPUT][1] = sizes[INPUT][0];
types[INPUT][1] = types[INPUT][0];
sizes[INPUT][2] = cvSize(pt_count, 1 );
types[INPUT][2] = CV_64FC3;
sizes[INPUT][3] = cvSize(4,3);
types[INPUT][3] = CV_64FC1;
sizes[INPUT][4] = sizes[INPUT][5] = cvSize(3,3);
types[INPUT][4] = types[INPUT][5] = CV_MAKETYPE(CV_64F, 1);
sizes[TEMP][0] = cvSize(3,3);
types[TEMP][0] = CV_64FC1;
sizes[TEMP][1] = cvSize(pt_count,1);
types[TEMP][1] = CV_8UC1;
sizes[OUTPUT][0] = sizes[REF_OUTPUT][0] = cvSize(3,1);
types[OUTPUT][0] = types[REF_OUTPUT][0] = CV_64FC1;
sizes[OUTPUT][1] = sizes[REF_OUTPUT][1] = cvSize(pt_count,1);
types[OUTPUT][1] = types[REF_OUTPUT][1] = CV_8UC1;
test_cpp = (cvtest::randInt(rng) & 256) == 0;
*/
}
int CV_HomographyTest::read_params(CvFileStorage *fs)
{
int code = cvtest::ArrayTest::read_params(fs);
return code;
}
double CV_HomographyTest::get_success_error_level(int test_case_idx, int i, int j)
{
return max_diff;
}
void CV_HomographyTest::fill_array( int test_case_idx, int i, int j, Mat& arr )
{
double t[9]={0};
RNG& rng = ts->get_rng();
if ( i != INPUT )
{
cvtest::ArrayTest::fill_array( test_case_idx, i, j, arr );
return;
}
switch( j )
{
case 0:
case 1:
return; // fill them later in prepare_test_case
case 2:
{
double* p = arr.ptr<double>();
for( i = 0; i < arr.cols*3; i += 3 )
{
/* p[i] = cvtest::randReal(rng)*square_size;
p[i+1] = cvtest::randReal(rng)*square_size;
p[i+2] = cvtest::randReal(rng)*square_size + square_size; */
}
}
break;
case 3:
{
double r[3];
Mat rot_vec( 3, 1, CV_64F, r );
Mat rot_mat( 3, 3, CV_64F, t, 4*sizeof(t[0]) );
r[0] = cvtest::randReal(rng)*CV_PI*2;
r[1] = cvtest::randReal(rng)*CV_PI*2;
r[2] = cvtest::randReal(rng)*CV_PI*2;
cvtest::Rodrigues( rot_vec, rot_mat );
/* t[3] = cvtest::randReal(rng)*square_size;
t[7] = cvtest::randReal(rng)*square_size;
t[11] = cvtest::randReal(rng)*square_size; */
Mat( 3, 4, CV_64F, t ).convertTo(arr, arr.type());
}
break;
case 4:
case 5:
{
/* t[0] = t[4] = cvtest::randReal(rng)*(max_f - min_f) + min_f;
t[2] = (img_size*0.5 + cvtest::randReal(rng)*4. - 2.)*t[0];
t[5] = (img_size*0.5 + cvtest::randReal(rng)*4. - 2.)*t[4];
t[8] = 1.0f;
Mat( 3, 3, CV_64F, t ).convertTo( arr, arr.type() ); */
break;
}
}
}
int CV_HomographyTest::prepare_test_case(int test_case_idx)
{
int code = cvtest::ArrayTest::prepare_test_case(test_case_idx);
if (code > 0)
{
Mat& src = test_mat[INPUT][0];
RNG& rng = ts->get_rng();
float Hdata[] = { sqrt(2.0f)/2, -sqrt(2.0f)/2, 0.0f,
sqrt(2.0f)/2, sqrt(2.0f)/2, 0.0f,
0.0f, 0.0f, 1.0f };
Mat H( 3, 3, CV_32F, Hdata );
cv::Mat dst(1, src.cols, CV_32FC2);
int k;
for( k = 0; k < 2; k++ )
{
const Mat& H = test_mat[OUTPUT][0];
Mat& dst = test_mat[INPUT][k == 0 ? 1 : 2];
for (int i = 0; i < src.cols; ++i)
{
float *s = src.ptr<float>()+2*i;
float *d = dst.ptr<float>()+2*i;
d[0] = Hdata[0]*s[0] + Hdata[1]*s[1] + Hdata[2];
d[1] = Hdata[3]*s[0] + Hdata[4]*s[1] + Hdata[5];
}
test_projectPoints( src, dst, H, &rng, sigma );
}
}
return code;
}
static void test_convertHomogeneous( const Mat& _src, Mat& _dst )
{
Mat src = _src, dst = _dst;
int i, count, sdims, ddims;
int sstep1, sstep2, dstep1, dstep2;
if( src.depth() != CV_64F ) _src.convertTo(src, CV_64F);
if( dst.depth() != CV_64F ) dst.create(dst.size(), CV_MAKETYPE(CV_64F, _dst.channels()));
if( src.rows > src.cols )
{
count = src.rows;
sdims = src.channels()*src.cols;
sstep1 = (int)(src.step/sizeof(double));
sstep2 = 1;
}
else
{
count = src.cols;
sdims = src.channels()*src.rows;
if( src.rows == 1 )
{
sstep1 = sdims;
sstep2 = 1;
}
else
{
sstep1 = 1;
sstep2 = (int)(src.step/sizeof(double));
}
}
if( dst.rows > dst.cols )
{
if (count != dst.rows) ; // CV_Error should be here
CV_Assert( count == dst.rows );
ddims = dst.channels()*dst.cols;
dstep1 = (int)(dst.step/sizeof(double));
dstep2 = 1;
}
else
{
assert( count == dst.cols );
ddims = dst.channels()*dst.rows;
if( dst.rows == 1 )
{
dstep1 = ddims;
dstep2 = 1;
}
else
{
dstep1 = 1;
dstep2 = (int)(dst.step/sizeof(double));
}
}
double* s = src.ptr<double>();
double* d = dst.ptr<double>();
if( sdims <= ddims )
{
int wstep = dstep2*(ddims - 1);
for( i = 0; i < count; i++, s += sstep1, d += dstep1 )
{
double x = s[0];
double y = s[sstep2];
d[wstep] = 1;
d[0] = x;
d[dstep2] = y;
if( sdims >= 3 )
{
d[dstep2*2] = s[sstep2*2];
if( sdims == 4 )
d[dstep2*3] = s[sstep2*3];
}
}
}
else
{
int wstep = sstep2*(sdims - 1);
for( i = 0; i < count; i++, s += sstep1, d += dstep1 )
{
double w = s[wstep];
double x = s[0];
double y = s[sstep2];
w = w ? 1./w : 1;
d[0] = x*w;
d[dstep2] = y*w;
if( ddims == 3 )
d[dstep2*2] = s[sstep2*2]*w;
}
}
if( dst.data != _dst.data )
dst.convertTo(_dst, _dst.depth());
}
void CV_HomographyTest::test_projectPoints( Mat& src_2d, Mat& dst, const Mat& H, RNG* rng, double sigma )
{
if (!src_2d.isContinuous())
{
CV_Error(-1, "");
return;
}
cv::Mat src_3d(1, src_2d.cols, CV_32FC3);
for (int i = 0; i < src_2d.cols; ++i)
{
float *c_3d = src_3d.ptr<float>()+3*i;
float *c_2d = src_2d.ptr<float>()+2*i;
c_3d[0] = c_2d[0]; c_3d[1] = c_2d[1]; c_3d[2] = 1.0f;
}
cv::Mat dst_3d; gemm(H, src_3d, 1, Mat(), 0, dst_3d);
int i, count = src_2d.cols;
Mat noise;
if ( rng )
{
if( sigma == 0 ) rng = 0;
else
{
noise.create( 1, count, CV_32FC2 );
rng->fill(noise, RNG::NORMAL, Scalar::all(0), Scalar::all(sigma) );
}
}
cv::Mat dst_2d(1, count, CV_32FC2);
for (size_t i = 0; i < count; ++i)
{
float *c_3d = dst_3d.ptr<float>()+3*i;
float *c_2d = dst_2d.ptr<float>()+2*i;
c_2d[0] = c_3d[0]/c_3d[2];
c_2d[1] = c_3d[1]/c_3d[2];
}
Mat temp( 1, count, CV_32FC2 );
for( i = 0; i < count; i++ )
{
const double* M = src_2d.ptr<double>() + 2*i;
double* m = temp.ptr<double>() + 2*i;
double X = M[0], Y = M[1], Z = M[2];
double u = H.at<float>(0, 0)*X + H.at<float>(0, 1)*Y + H.at<float>(0, 2);
double v = H.at<float>(1, 0)*X + H.at<float>(1, 1)*Y + H.at<float>(1, 2);
double s = H.at<float>(2, 0)*X + H.at<float>(2, 1)*Y + H.at<float>(2, 2);
if( !noise.empty() )
{
u += noise.at<Point2f>(i).x*s;
v += noise.at<Point2f>(i).y*s;
}
m[0] = u;
m[1] = v;
m[2] = s;
}
test_convertHomogeneous( dst_2d, dst );
}
void CV_HomographyTest::prepare_to_validation(int test_case_idx)
{
const Mat& H = test_mat[INPUT][3];
const Mat& A1 = test_mat[INPUT][4];
const Mat& A2 = test_mat[INPUT][5];
double h0[9], h[9];
Mat H0(3, 3, CV_32FC1, h0);
Mat invA1, invA2, T;
cv::invert(A1, invA1, CV_SVD);
cv::invert(A2, invA2, CV_SVD);
double tx = H.at<double>(0, 2);
double ty = H.at<double>(1, 2);
double tz = H.at<double>(2, 2);
// double _t_x[] = { 0, -tz, ty, tz, 0, -tx, -ty, tx, 0 };
// F = (A2^-T)*[t]_x*R*(A1^-1)
/* cv::gemm( invA2, Mat( 3, 3, CV_64F, _t_x ), 1, Mat(), 0, T, CV_GEMM_A_T );
cv::gemm( R, invA1, 1, Mat(), 0, invA2 );
cv::gemm( T, invA2, 1, Mat(), 0, F0 ); */
H0 *= 1./h0[8];
uchar* status = test_mat[TEMP][1].data;
double err_level = get_success_error_level( test_case_idx, OUTPUT, 1 );
uchar* mtfm1 = test_mat[REF_OUTPUT][1].data;
uchar* mtfm2 = test_mat[OUTPUT][1].data;
double* f_prop1 = (double*)test_mat[REF_OUTPUT][0].data;
double* f_prop2 = (double*)test_mat[OUTPUT][0].data;
int i, pt_count = test_mat[INPUT][2].cols;
Mat p1( 1, pt_count, CV_64FC2 );
Mat p2( 1, pt_count, CV_64FC2 );
test_convertHomogeneous( test_mat[INPUT][0], p1 );
test_convertHomogeneous( test_mat[INPUT][1], p2 );
cvtest::convert(test_mat[TEMP][0], H0, H.type());
if( method <= CV_FM_8POINT )
memset( status, 1, pt_count );
for( i = 0; i < pt_count; i++ )
{
double x1 = p1.at<Point2f>(i).x;
double y1 = p1.at<Point2f>(i).y;
double x2 = p2.at<Point2f>(i).x;
double y2 = p2.at<Point2f>(i).y;
double n1 = 1./sqrt(x1*x1 + y1*y1 + 1);
double n2 = 1./sqrt(x2*x2 + y2*y2 + 1);
double t0 = fabs(h0[0]*x2*x1 + h0[1]*x2*y1 + h0[2]*x2 +
h0[3]*y2*x1 + h0[4]*y2*y1 + h0[5]*y2 +
h0[6]*x1 + h0[7]*y1 + h0[8])*n1*n2;
double t = fabs(h[0]*x2*x1 + h[1]*x2*y1 + h[2]*x2 +
h[3]*y2*x1 + h[4]*y2*y1 + h[5]*y2 +
h[6]*x1 + h[7]*y1 + h[8])*n1*n2;
mtfm1[i] = 1;
mtfm2[i] = !status[i] || t0 > err_level || t < err_level;
}
f_prop1[0] = 1;
f_prop1[1] = 1;
f_prop1[2] = 0;
// f_prop2[0] = f_result != 0;
f_prop2[1] = h[8];
f_prop2[2] = cv::determinant( H );
}
bool CV_HomographyTest::check_matrix_size(const cv::Mat& H) bool CV_HomographyTest::check_matrix_size(const cv::Mat& H)
{ {
return (H.rows == 3) && (H.cols == 3); return (H.rows == 3) && (H.cols == 3);
...@@ -548,21 +85,21 @@ int CV_HomographyTest::check_ransac_mask_1(const Mat& src, const Mat& mask) ...@@ -548,21 +85,21 @@ int CV_HomographyTest::check_ransac_mask_1(const Mat& src, const Mat& mask)
{ {
if (!(mask.cols == 1) && (mask.rows == src.cols)) return 1; if (!(mask.cols == 1) && (mask.rows == src.cols)) return 1;
if (countNonZero(mask) < mask.rows) return 2; if (countNonZero(mask) < mask.rows) return 2;
for (size_t i = 0; i < mask.rows; ++i) if (mask.at<uchar>(i, 0) > 1) return 3; for (int i = 0; i < mask.rows; ++i) if (mask.at<uchar>(i, 0) > 1) return 3;
return 0; return 0;
} }
int CV_HomographyTest::check_ransac_mask_2(const Mat& original_mask, const Mat& found_mask) int CV_HomographyTest::check_ransac_mask_2(const Mat& original_mask, const Mat& found_mask)
{ {
if (!(found_mask.cols == 1) && (found_mask.rows == original_mask.rows)) return 1; if (!(found_mask.cols == 1) && (found_mask.rows == original_mask.rows)) return 1;
for (size_t i = 0; i < found_mask.rows; ++i) if (found_mask.at<uchar>(i, 0) > 1) return 2; for (int i = 0; i < found_mask.rows; ++i) if (found_mask.at<uchar>(i, 0) > 1) return 2;
return 0; return 0;
} }
void CV_HomographyTest::print_information_1(int j, int N, int method, const Mat& H) void CV_HomographyTest::print_information_1(int j, int N, int method, const Mat& H)
{ {
cout << endl; cout << "Checking for homography matrix sizes..." << endl; cout << endl; cout << endl; cout << "Checking for homography matrix sizes..." << endl; cout << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Count of points: " << N << endl; cout << endl; cout << "Count of points: " << N << endl; cout << endl;
cout << "Method: "; if (method == 0) cout << 0; else if (method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl; cout << "Method: "; if (method == 0) cout << 0; else if (method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl;
...@@ -574,7 +111,7 @@ void CV_HomographyTest::print_information_1(int j, int N, int method, const Mat& ...@@ -574,7 +111,7 @@ void CV_HomographyTest::print_information_1(int j, int N, int method, const Mat&
void CV_HomographyTest::print_information_2(int j, int N, int method, const Mat& H, const Mat& H_res, int k, double diff) void CV_HomographyTest::print_information_2(int j, int N, int method, const Mat& H, const Mat& H_res, int k, double diff)
{ {
cout << endl; cout << "Checking for accuracy of homography matrix computing..." << endl; cout << endl; cout << endl; cout << "Checking for accuracy of homography matrix computing..." << endl; cout << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Count of points: " << N << endl; cout << endl; cout << "Count of points: " << N << endl; cout << endl;
cout << "Method: "; if (method == 0) cout << 0; else if (method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl; cout << "Method: "; if (method == 0) cout << 0; else if (method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl;
...@@ -583,14 +120,14 @@ void CV_HomographyTest::print_information_2(int j, int N, int method, const Mat& ...@@ -583,14 +120,14 @@ void CV_HomographyTest::print_information_2(int j, int N, int method, const Mat&
cout << "Found matrix:" << endl; cout << endl; cout << "Found matrix:" << endl; cout << endl;
cout << H_res << endl; cout << endl; cout << H_res << endl; cout << endl;
cout << "Norm type using in criteria: "; if (NORM_TYPE[k] == 1) cout << "INF"; else if (NORM_TYPE[k] == 2) cout << "L1"; else cout << "L2"; cout << endl; cout << "Norm type using in criteria: "; if (NORM_TYPE[k] == 1) cout << "INF"; else if (NORM_TYPE[k] == 2) cout << "L1"; else cout << "L2"; cout << endl;
cout << "Difference between matrix: " << diff << endl; cout << "Difference between matrices: " << diff << endl;
cout << "Maximum allowed difference: " << max_diff << endl; cout << endl; cout << "Maximum allowed difference: " << max_diff << endl; cout << endl;
} }
void CV_HomographyTest::print_information_3(int j, int N, const Mat& mask) void CV_HomographyTest::print_information_3(int j, int N, const Mat& mask)
{ {
cout << endl; cout << "Checking for inliers/outliers mask..." << endl; cout << endl; cout << endl; cout << "Checking for inliers/outliers mask..." << endl; cout << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Count of points: " << N << endl; cout << endl; cout << "Count of points: " << N << endl; cout << endl;
cout << "Method: RANSAC" << endl; cout << "Method: RANSAC" << endl;
...@@ -603,7 +140,7 @@ void CV_HomographyTest::print_information_4(int method, int j, int N, int k, int ...@@ -603,7 +140,7 @@ void CV_HomographyTest::print_information_4(int method, int j, int N, int k, int
{ {
cout << endl; cout << "Checking for accuracy of reprojection error computing..." << endl; cout << endl; cout << endl; cout << "Checking for accuracy of reprojection error computing..." << endl; cout << endl;
cout << "Method: "; if (method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl; cout << "Method: "; if (method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Sigma of normal noise: " << sigma << endl; cout << "Sigma of normal noise: " << sigma << endl;
cout << "Count of points: " << N << endl; cout << "Count of points: " << N << endl;
...@@ -617,7 +154,7 @@ void CV_HomographyTest::print_information_5(int method, int j, int N, int l, dou ...@@ -617,7 +154,7 @@ void CV_HomographyTest::print_information_5(int method, int j, int N, int l, dou
{ {
cout << endl; cout << "Checking for accuracy of reprojection error computing..." << endl; cout << endl; cout << endl; cout << "Checking for accuracy of reprojection error computing..." << endl; cout << endl;
cout << "Method: "; if (method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl; cout << "Method: "; if (method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Sigma of normal noise: " << sigma << endl; cout << "Sigma of normal noise: " << sigma << endl;
cout << "Count of points: " << N << endl; cout << "Count of points: " << N << endl;
...@@ -630,7 +167,7 @@ void CV_HomographyTest::print_information_6(int j, int N, int k, double diff, bo ...@@ -630,7 +167,7 @@ void CV_HomographyTest::print_information_6(int j, int N, int k, double diff, bo
{ {
cout << endl; cout << "Checking for inliers/outliers mask..." << endl; cout << endl; cout << endl; cout << "Checking for inliers/outliers mask..." << endl; cout << endl;
cout << "Method: RANSAC" << endl; cout << "Method: RANSAC" << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Count of points: " << N << " " << endl; cout << "Count of points: " << N << " " << endl;
cout << "Number of point: " << k << " " << endl; cout << "Number of point: " << k << " " << endl;
...@@ -643,7 +180,7 @@ void CV_HomographyTest::print_information_7(int j, int N, int k, double diff, bo ...@@ -643,7 +180,7 @@ void CV_HomographyTest::print_information_7(int j, int N, int k, double diff, bo
{ {
cout << endl; cout << "Checking for inliers/outliers mask..." << endl; cout << endl; cout << endl; cout << "Checking for inliers/outliers mask..." << endl; cout << endl;
cout << "Method: RANSAC" << endl; cout << "Method: RANSAC" << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Count of points: " << N << " " << endl; cout << "Count of points: " << N << " " << endl;
cout << "Number of point: " << k << " " << endl; cout << "Number of point: " << k << " " << endl;
...@@ -657,7 +194,7 @@ void CV_HomographyTest::print_information_8(int j, int N, int k, int l, double d ...@@ -657,7 +194,7 @@ void CV_HomographyTest::print_information_8(int j, int N, int k, int l, double d
cout << endl; cout << "Checking for reprojection error of inlier..." << endl; cout << endl; cout << endl; cout << "Checking for reprojection error of inlier..." << endl; cout << endl;
cout << "Method: RANSAC" << endl; cout << "Method: RANSAC" << endl;
cout << "Sigma of normal noise: " << sigma << endl; cout << "Sigma of normal noise: " << sigma << endl;
cout << "Type of srcPoints: "; if (0 <= j < 2) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>";
cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl; cout << " Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
cout << "Count of points: " << N << " " << endl; cout << "Count of points: " << N << " " << endl;
cout << "Number of point: " << k << " " << endl; cout << "Number of point: " << k << " " << endl;
...@@ -666,21 +203,6 @@ void CV_HomographyTest::print_information_8(int j, int N, int k, int l, double d ...@@ -666,21 +203,6 @@ void CV_HomographyTest::print_information_8(int j, int N, int k, int l, double d
cout << "Maxumum allowed difference: " << max_2diff << endl; cout << endl; cout << "Maxumum allowed difference: " << max_2diff << endl; cout << endl;
} }
void CV_HomographyTest::check_transform_quality(cv::InputArray src_points, cv::InputArray dst_points, const cv::Mat& H, const int norm_type)
{
Mat src, dst_original;
cv::transpose(src_points.getMat(), src); cv::transpose(dst_points.getMat(), dst_original);
cv::Mat src_3d(src.rows+1, src.cols, CV_32FC1);
src_3d(Rect(0, 0, src.rows, src.cols)) = src;
src_3d(Rect(src.rows, 0, 1, src.cols)) = Mat(1, src.cols, CV_32FC1, Scalar(1.0f));
cv::Mat dst_found, dst_found_3d;
cv::multiply(H, src_3d, dst_found_3d);
dst_found = dst_found_3d/dst_found_3d.row(dst_found_3d.rows-1);
double reprojection_error = cv::norm(dst_original, dst_found, norm_type);
CV_Assert ( reprojection_error > max_diff );
}
void CV_HomographyTest::run(int) void CV_HomographyTest::run(int)
{ {
for (size_t N = 4; N <= MAX_COUNT_OF_POINTS; ++N) for (size_t N = 4; N <= MAX_COUNT_OF_POINTS; ++N)
...@@ -689,7 +211,7 @@ void CV_HomographyTest::run(int) ...@@ -689,7 +211,7 @@ void CV_HomographyTest::run(int)
float *src_data = new float [2*N]; float *src_data = new float [2*N];
for (int i = 0; i < N; ++i) for (size_t i = 0; i < N; ++i)
{ {
src_data[2*i] = (float)cvtest::randReal(rng)*image_size; src_data[2*i] = (float)cvtest::randReal(rng)*image_size;
src_data[2*i+1] = (float)cvtest::randReal(rng)*image_size; src_data[2*i+1] = (float)cvtest::randReal(rng)*image_size;
...@@ -834,11 +356,10 @@ void CV_HomographyTest::run(int) ...@@ -834,11 +356,10 @@ void CV_HomographyTest::run(int)
cv::Mat mask(N, 1, CV_8UC1); cv::Mat mask(N, 1, CV_8UC1);
for (int i = 0; i < N; ++i) for (size_t i = 0; i < N; ++i)
{ {
float *a = noise_2f.ptr<float>()+2*i, *_2f = dst_mat_2f.ptr<float>()+2*i; float *a = noise_2f.ptr<float>()+2*i, *_2f = dst_mat_2f.ptr<float>()+2*i;
_2f[0] /* = dst_mat_2d.at<float>(0, i) = dst_mat_3d.at<float>(0, i) */ += a[0]; _2f[0] += a[0]; _2f[1] += a[1];
_2f[1] /* = dst_mat_2d.at<float>(1, i) = dst_mat_3d.at<float>(1, i) */ += a[1];
mask.at<bool>(i, 0) = !(sqrt(a[0]*a[0]+a[1]*a[1]) > reproj_threshold); mask.at<bool>(i, 0) = !(sqrt(a[0]*a[0]+a[1]*a[1]) > reproj_threshold);
} }
...@@ -1005,4 +526,4 @@ void CV_HomographyTest::run(int) ...@@ -1005,4 +526,4 @@ void CV_HomographyTest::run(int)
} }
} }
TEST(Calib3d_Homography, complex_test) { CV_HomographyTest test; test.safe_run(); } TEST(Calib3d_Homography, accuracy) { CV_HomographyTest test; test.safe_run(); }
\ No newline at end of file
modules/core/test/test_countnonzero.cpp
View file @ 07fa62f0
...@@ -18,14 +18,14 @@ const int INT_TYPE [5] = {CV_8U, CV_8S, CV_16U, CV_16S, CV_32S}; ...@@ -18,14 +18,14 @@ const int INT_TYPE [5] = {CV_8U, CV_8S, CV_16U, CV_16S, CV_32S};
class CV_CountNonZeroTest: public cvtest::BaseTest class CV_CountNonZeroTest: public cvtest::BaseTest
{ {
public: public:
CV_CountNonZeroTest(); CV_CountNonZeroTest();
~CV_CountNonZeroTest(); ~CV_CountNonZeroTest();
protected: protected:
void run (int); void run (int);
private: private:
float eps_32; float eps_32;
double eps_64; double eps_64;
Mat src; Mat src;
...@@ -47,8 +47,8 @@ void CV_CountNonZeroTest::generate_src_data(cv::Size size, int type) ...@@ -47,8 +47,8 @@ void CV_CountNonZeroTest::generate_src_data(cv::Size size, int type)
{ {
src.create(size, CV_MAKETYPE(type, 1)); src.create(size, CV_MAKETYPE(type, 1));
for (size_t j = 0; j < size.width; ++j) for (int j = 0; j < size.width; ++j)
for (size_t i = 0; i < size.height; ++i) for (int i = 0; i < size.height; ++i)
switch (type) switch (type)
{ {
case CV_8U: { src.at<uchar>(i, j) = cv::randu<uchar>(); break; } case CV_8U: { src.at<uchar>(i, j) = cv::randu<uchar>(); break; }
...@@ -107,8 +107,8 @@ int CV_CountNonZeroTest::get_count_non_zero() ...@@ -107,8 +107,8 @@ int CV_CountNonZeroTest::get_count_non_zero()
{ {
int result = 0; int result = 0;
for (size_t i = 0; i < src.rows; ++i) for (int i = 0; i < src.rows; ++i)
for (size_t j = 0; j < src.cols; ++j) for (int j = 0; j < src.cols; ++j)
if (current_type == CV_8U) result += (src.at<uchar>(i, j) > 0); if (current_type == CV_8U) result += (src.at<uchar>(i, j) > 0);
......
modules/core/test/test_eigen.cpp
View file @ 07fa62f0
...@@ -12,20 +12,32 @@ using namespace std; ...@@ -12,20 +12,32 @@ using namespace std;
#define CORE_EIGEN_ERROR_ORTHO 4 #define CORE_EIGEN_ERROR_ORTHO 4
#define CORE_EIGEN_ERROR_ORDER 5 #define CORE_EIGEN_ERROR_ORDER 5
#define MESSAGE_ERROR_COUNT "Matrix of eigen values must have the same rows as source matrix and 1 column."
#define MESSAGE_ERROR_SIZE "Source matrix and matrix of eigen vectors must have the same sizes."
#define MESSAGE_ERROR_DIFF_1 "Accurasy of eigen values computing less than required."
#define MESSAGE_ERROR_DIFF_2 "Accuracy of eigen vectors computing less than required."
#define MESSAGE_ERROR_ORTHO "Matrix of eigen vectors is not orthogonal."
#define MESSAGE_ERROR_ORDER "Eigen values are not sorted in ascending order."
const size_t COUNT_NORM_TYPES = 3;
const size_t NORM_TYPE[COUNT_NORM_TYPES] = {cv::NORM_L1, cv::NORM_L2, cv::NORM_INF};
enum TASK_TYPE_EIGEN {VALUES, VECTORS};
class Core_EigenTest: public cvtest::BaseTest class Core_EigenTest: public cvtest::BaseTest
{ {
public: public:
Core_EigenTest(); Core_EigenTest();
~Core_EigenTest(); ~Core_EigenTest();
protected: protected:
bool test_values(const cv::Mat& src); // complex test for eigen without vectors bool test_values(const cv::Mat& src); // complex test for eigen without vectors
bool check_full(int type); // compex test for symmetric matrix bool check_full(int type); // compex test for symmetric matrix
virtual void run (int) = 0; // main testing method virtual void run (int) = 0; // main testing method
private: private:
float eps_val_32, eps_vec_32; float eps_val_32, eps_vec_32;
float eps_val_64, eps_vec_64; float eps_val_64, eps_vec_64;
...@@ -34,19 +46,22 @@ class Core_EigenTest: public cvtest::BaseTest ...@@ -34,19 +46,22 @@ class Core_EigenTest: public cvtest::BaseTest
bool check_pairs_order(const cv::Mat& eigen_values); // checking order of eigen values & vectors (it should be none up) bool check_pairs_order(const cv::Mat& eigen_values); // checking order of eigen values & vectors (it should be none up)
bool check_orthogonality(const cv::Mat& U); // checking is matrix of eigen vectors orthogonal bool check_orthogonality(const cv::Mat& U); // checking is matrix of eigen vectors orthogonal
bool test_pairs(const cv::Mat& src); // complex test for eigen with vectors bool test_pairs(const cv::Mat& src); // complex test for eigen with vectors
void print_information(const size_t norm_idx, const cv::Mat& src, double diff, double max_diff);
}; };
class Core_EigenTest_Scalar : public Core_EigenTest class Core_EigenTest_Scalar : public Core_EigenTest
{ {
public: public:
Core_EigenTest_Scalar() : Core_EigenTest() {} Core_EigenTest_Scalar() : Core_EigenTest() {}
~Core_EigenTest_Scalar(); ~Core_EigenTest_Scalar();
virtual void run(int) = 0; virtual void run(int) = 0;
}; };
class Core_EigenTest_Scalar_32 : public Core_EigenTest_Scalar class Core_EigenTest_Scalar_32 : public Core_EigenTest_Scalar
{ {
public: public:
Core_EigenTest_Scalar_32() : Core_EigenTest_Scalar() {} Core_EigenTest_Scalar_32() : Core_EigenTest_Scalar() {}
~Core_EigenTest_Scalar_32(); ~Core_EigenTest_Scalar_32();
...@@ -55,7 +70,7 @@ class Core_EigenTest_Scalar_32 : public Core_EigenTest_Scalar ...@@ -55,7 +70,7 @@ class Core_EigenTest_Scalar_32 : public Core_EigenTest_Scalar
class Core_EigenTest_Scalar_64 : public Core_EigenTest_Scalar class Core_EigenTest_Scalar_64 : public Core_EigenTest_Scalar
{ {
public: public:
Core_EigenTest_Scalar_64() : Core_EigenTest_Scalar() {} Core_EigenTest_Scalar_64() : Core_EigenTest_Scalar() {}
~Core_EigenTest_Scalar_64(); ~Core_EigenTest_Scalar_64();
void run(int); void run(int);
...@@ -63,7 +78,7 @@ class Core_EigenTest_Scalar_64 : public Core_EigenTest_Scalar ...@@ -63,7 +78,7 @@ class Core_EigenTest_Scalar_64 : public Core_EigenTest_Scalar
class Core_EigenTest_32 : public Core_EigenTest class Core_EigenTest_32 : public Core_EigenTest
{ {
public: public:
Core_EigenTest_32(): Core_EigenTest() {} Core_EigenTest_32(): Core_EigenTest() {}
~Core_EigenTest_32() {} ~Core_EigenTest_32() {}
void run(int); void run(int);
...@@ -71,7 +86,7 @@ class Core_EigenTest_32 : public Core_EigenTest ...@@ -71,7 +86,7 @@ class Core_EigenTest_32 : public Core_EigenTest
class Core_EigenTest_64 : public Core_EigenTest class Core_EigenTest_64 : public Core_EigenTest
{ {
public: public:
Core_EigenTest_64(): Core_EigenTest() {} Core_EigenTest_64(): Core_EigenTest() {}
~Core_EigenTest_64() {} ~Core_EigenTest_64() {}
void run(int); void run(int);
...@@ -108,8 +123,10 @@ bool Core_EigenTest::check_pair_count(const cv::Mat& src, const cv::Mat& evalues ...@@ -108,8 +123,10 @@ bool Core_EigenTest::check_pair_count(const cv::Mat& src, const cv::Mat& evalues
int n = src.rows, s = sign(high_index); int n = src.rows, s = sign(high_index);
if (!( (evalues.rows == n - max<int>(0, low_index) - ((int)((n/2.0)*(s*s-s)) + (1+s-s*s)*(n - (high_index+1)))) && (evalues.cols == 1))) if (!( (evalues.rows == n - max<int>(0, low_index) - ((int)((n/2.0)*(s*s-s)) + (1+s-s*s)*(n - (high_index+1)))) && (evalues.cols == 1)))
{ {
std::cout << "Checking sizes of eigen values matrix " << evalues << "..." << endl; std::cout << endl; std::cout << "Checking sizes of eigen values matrix " << evalues << "..." << endl;
CV_Error(CORE_EIGEN_ERROR_COUNT, "Matrix of eigen values must have the same rows as source matrix and 1 column."); std::cout << "Number of rows: " << evalues.rows << " Number of cols: " << evalues.cols << endl;
std:: cout << "Size of src symmetric matrix: " << src.rows << " * " << src.cols << endl; std::cout << endl;
CV_Error(CORE_EIGEN_ERROR_COUNT, MESSAGE_ERROR_COUNT);
return false; return false;
} }
return true; return true;
...@@ -122,21 +139,41 @@ bool Core_EigenTest::check_pair_count(const cv::Mat& src, const cv::Mat& evalues ...@@ -122,21 +139,41 @@ bool Core_EigenTest::check_pair_count(const cv::Mat& src, const cv::Mat& evalues
if (!((evectors.rows == right_eigen_pair_count) && (evectors.cols == right_eigen_pair_count))) if (!((evectors.rows == right_eigen_pair_count) && (evectors.cols == right_eigen_pair_count)))
{ {
std::cout << "Checking sizes of eigen vectors matrix " << evectors << "..." << endl; std::cout << endl; std::cout << "Checking sizes of eigen vectors matrix " << evectors << "..." << endl;
CV_Error (CORE_EIGEN_ERROR_SIZE, "Source matrix and matrix of eigen vectors must have the same sizes."); std::cout << "Number of rows: " << evectors.rows << " Number of cols: " << evectors.cols << endl;
std:: cout << "Size of src symmetric matrix: " << src.rows << " * " << src.cols << endl; std::cout << endl;
CV_Error (CORE_EIGEN_ERROR_SIZE, MESSAGE_ERROR_SIZE);
return false; return false;
} }
if (!((evalues.rows == right_eigen_pair_count) && (evalues.cols == 1))) if (!((evalues.rows == right_eigen_pair_count) && (evalues.cols == 1)))
{ {
std::cout << "Checking sizes of eigen values matrix " << evalues << "..." << endl; std::cout << endl; std::cout << "Checking sizes of eigen values matrix " << evalues << "..." << endl;
CV_Error (CORE_EIGEN_ERROR_COUNT, "Matrix of eigen values must have the same rows as source matrix and 1 column."); std::cout << "Number of rows: " << evalues.rows << " Number of cols: " << evalues.cols << endl;
std:: cout << "Size of src symmetric matrix: " << src.rows << " * " << src.cols << endl; std::cout << endl;
CV_Error (CORE_EIGEN_ERROR_COUNT, MESSAGE_ERROR_COUNT);
return false; return false;
} }
return true; return true;
} }
void Core_EigenTest::print_information(const size_t norm_idx, const cv::Mat& src, double diff, double max_diff)
{
switch (NORM_TYPE[norm_idx])
{
case cv::NORM_L1: {std::cout << "L1"; break;}
case cv::NORM_L2: {std::cout << "L2"; break;}
case cv::NORM_INF: {std::cout << "INF"; break;}
default: break;
}
cout << "-criteria... " << endl;
cout << "Source size: " << src.rows << " * " << src.cols << endl;
cout << "Difference between original eigen vectors matrix and result: " << diff << endl;
cout << "Maximum allowed difference: " << max_diff << endl; cout << endl;
}
bool Core_EigenTest::check_orthogonality(const cv::Mat& U) bool Core_EigenTest::check_orthogonality(const cv::Mat& U)
{ {
int type = U.type(); int type = U.type();
...@@ -145,13 +182,17 @@ bool Core_EigenTest::check_orthogonality(const cv::Mat& U) ...@@ -145,13 +182,17 @@ bool Core_EigenTest::check_orthogonality(const cv::Mat& U)
cv::Mat E = Mat::eye(U.rows, U.cols, type); cv::Mat E = Mat::eye(U.rows, U.cols, type);
double diff_L1 = cv::norm(UUt, E, NORM_L1); for (size_t i = 0; i < COUNT_NORM_TYPES; ++i)
double diff_L2 = cv::norm(UUt, E, NORM_L2); {
double diff_INF = cv::norm(UUt, E, NORM_INF); double diff = cv::norm(UUt, E, NORM_TYPE[i]);
if (diff > eps_vec)
if (diff_L1 > eps_vec) { std::cout << "Checking orthogonality of matrix " << U << "..." << endl; CV_Error(CORE_EIGEN_ERROR_ORTHO, "Matrix of eigen vectors is not orthogonal."); return false; } {
if (diff_L2 > eps_vec) { std::cout << "Checking orthogonality of matrix " << U << "..." << endl; CV_Error(CORE_EIGEN_ERROR_ORTHO, "Matrix of eigen vectors is not orthogonal."); return false; } std::cout << endl; std::cout << "Checking orthogonality of matrix " << U << ": ";
if (diff_INF > eps_vec) { std::cout << "Checking orthogonality of matrix " << U << "..." << endl; CV_Error(CORE_EIGEN_ERROR_ORTHO, "Matrix of eigen vectors is not orthogonal."); return false; } print_information(i, U, diff, eps_vec);
CV_Error(CORE_EIGEN_ERROR_ORTHO, MESSAGE_ERROR_ORTHO);
return false;
}
}
return true; return true;
} }
...@@ -162,11 +203,13 @@ bool Core_EigenTest::check_pairs_order(const cv::Mat& eigen_values) ...@@ -162,11 +203,13 @@ bool Core_EigenTest::check_pairs_order(const cv::Mat& eigen_values)
{ {
case CV_32FC1: case CV_32FC1:
{ {
for (int i = 0; i < eigen_values.total() - 1; ++i) for (size_t i = 0; i < eigen_values.total() - 1; ++i)
if (!(eigen_values.at<float>(i, 0) > eigen_values.at<float>(i+1, 0))) if (!(eigen_values.at<float>(i, 0) > eigen_values.at<float>(i+1, 0)))
{ {
std::cout << "Checking order of eigen values vector " << eigen_values << "..." << endl; std::cout << endl; std::cout << "Checking order of eigen values vector " << eigen_values << "..." << endl;
CV_Error(CORE_EIGEN_ERROR_ORDER, "Eigen values are not sorted in ascending order."); std::cout << "Pair of indexes with non ascending of eigen values: (" << i << ", " << i+1 << ")." << endl;
std::cout << endl;
CV_Error(CORE_EIGEN_ERROR_ORDER, MESSAGE_ERROR_ORDER);
return false; return false;
} }
...@@ -175,10 +218,12 @@ bool Core_EigenTest::check_pairs_order(const cv::Mat& eigen_values) ...@@ -175,10 +218,12 @@ bool Core_EigenTest::check_pairs_order(const cv::Mat& eigen_values)
case CV_64FC1: case CV_64FC1:
{ {
for (int i = 0; i < eigen_values.total() - 1; ++i) for (size_t i = 0; i < eigen_values.total() - 1; ++i)
if (!(eigen_values.at<double>(i, 0) > eigen_values.at<double>(i+1, 0))) if (!(eigen_values.at<double>(i, 0) > eigen_values.at<double>(i+1, 0)))
{ {
std::cout << "Checking order of eigen values vector " << eigen_values << "..." << endl; std::cout << endl; std::cout << "Checking order of eigen values vector " << eigen_values << "..." << endl;
std::cout << "Pair of indexes with non ascending of eigen values: (" << i << ", " << i+1 << ")." << endl;
std::cout << endl;
CV_Error(CORE_EIGEN_ERROR_ORDER, "Eigen values are not sorted in ascending order."); CV_Error(CORE_EIGEN_ERROR_ORDER, "Eigen values are not sorted in ascending order.");
return false; return false;
} }
...@@ -218,10 +263,10 @@ bool Core_EigenTest::test_pairs(const cv::Mat& src) ...@@ -218,10 +263,10 @@ bool Core_EigenTest::test_pairs(const cv::Mat& src)
{ {
case CV_32FC1: case CV_32FC1:
{ {
for (size_t i = 0; i < src.cols; ++i) for (int i = 0; i < src.cols; ++i)
{ {
cv::Mat tmp = eigen_values.at<float>(i, 0) * eigen_vectors_t.col(i); cv::Mat tmp = eigen_values.at<float>(i, 0) * eigen_vectors_t.col(i);
for (size_t j = 0; j < src.rows; ++j) eval_evec.at<float>(j, i) = tmp.at<float>(j, 0); for (int j = 0; j < src.rows; ++j) eval_evec.at<float>(j, i) = tmp.at<float>(j, 0);
} }
break; break;
...@@ -229,10 +274,10 @@ bool Core_EigenTest::test_pairs(const cv::Mat& src) ...@@ -229,10 +274,10 @@ bool Core_EigenTest::test_pairs(const cv::Mat& src)
case CV_64FC1: case CV_64FC1:
{ {
for (size_t i = 0; i < src.cols; ++i) for (int i = 0; i < src.cols; ++i)
{ {
cv::Mat tmp = eigen_values.at<double>(i, 0) * eigen_vectors_t.col(i); cv::Mat tmp = eigen_values.at<double>(i, 0) * eigen_vectors_t.col(i);
for (size_t j = 0; j < src.rows; ++j) eval_evec.at<double>(j, i) = tmp.at<double>(j, 0); for (int j = 0; j < src.rows; ++j) eval_evec.at<double>(j, i) = tmp.at<double>(j, 0);
} }
break; break;
...@@ -243,13 +288,17 @@ bool Core_EigenTest::test_pairs(const cv::Mat& src) ...@@ -243,13 +288,17 @@ bool Core_EigenTest::test_pairs(const cv::Mat& src)
cv::Mat disparity = src_evec - eval_evec; cv::Mat disparity = src_evec - eval_evec;
double diff_L1 = cv::norm(disparity, NORM_L1); for (size_t i = 0; i < COUNT_NORM_TYPES; ++i)
double diff_L2 = cv::norm(disparity, NORM_L2); {
double diff_INF = cv::norm(disparity, NORM_INF); double diff = cv::norm(disparity, NORM_TYPE[i]);
if (diff > eps_vec)
if (diff_L1 > eps_vec) { std::cout << "Checking accuracy of eigen vectors computing for matrix " << src << ": L1-criteria..." << endl; CV_Error(CORE_EIGEN_ERROR_DIFF, "Accuracy of eigen vectors computing less than required."); return false; } {
if (diff_L2 > eps_vec) { std::cout << "Checking accuracy of eigen vectors computing for matrix " << src << ": L2-criteria..." << endl; CV_Error(CORE_EIGEN_ERROR_DIFF, "Accuracy of eigen vectors computing less than required."); return false; } std::cout << endl; std::cout << "Checking accuracy of eigen vectors computing for matrix " << src << ": ";
if (diff_INF > eps_vec) { std::cout << "Checking accuracy of eigen vectors computing for matrix " << src << ": INF-criteria..." << endl; CV_Error(CORE_EIGEN_ERROR_DIFF, "Accuracy of eigen vectors computing less than required."); return false; } print_information(i, src, diff, eps_vec);
CV_Error(CORE_EIGEN_ERROR_DIFF, MESSAGE_ERROR_DIFF_2);
return false;
}
}
return true; return true;
} }
...@@ -268,13 +317,17 @@ bool Core_EigenTest::test_values(const cv::Mat& src) ...@@ -268,13 +317,17 @@ bool Core_EigenTest::test_values(const cv::Mat& src)
if (!check_pair_count(src, eigen_values_2)) return false; if (!check_pair_count(src, eigen_values_2)) return false;
double diff_L1 = cv::norm(eigen_values_1, eigen_values_2, NORM_L1); for (size_t i = 0; i < COUNT_NORM_TYPES; ++i)
double diff_L2 = cv::norm(eigen_values_1, eigen_values_2, NORM_L2); {
double diff_INF = cv::norm(eigen_values_1, eigen_values_2, NORM_INF); double diff = cv::norm(eigen_values_1, eigen_values_2, NORM_TYPE[i]);
if (diff > eps_val)
if (diff_L1 > eps_val) { std::cout << "Checking accuracy of eigen values computing for matrix " << src << ": L1-criteria..." << endl; CV_Error(CORE_EIGEN_ERROR_DIFF, "Accuracy of eigen values computing less than required."); return false; } {
if (diff_L2 > eps_val) { std::cout << "Checking accuracy of eigen values computing for matrix " << src << ": L2-criteria..." << endl; CV_Error(CORE_EIGEN_ERROR_DIFF, "Accuracy of eigen vectors computing less than required."); return false; } std::cout << endl; std::cout << "Checking accuracy of eigen values computing for matrix " << src << ": ";
if (diff_INF > eps_val) { std::cout << "Checking accuracy of eigen values computing for matrix " << src << ": INF-criteria..." << endl; CV_Error(CORE_EIGEN_ERROR_DIFF, "Accuracy of eigen vectors computing less than required."); return false; } print_information(i, src, diff, eps_val);
CV_Error(CORE_EIGEN_ERROR_DIFF, MESSAGE_ERROR_DIFF_1);
return false;
}
}
return true; return true;
} }
...@@ -286,7 +339,7 @@ bool Core_EigenTest::check_full(int type) ...@@ -286,7 +339,7 @@ bool Core_EigenTest::check_full(int type)
srand(time(0)); srand(time(0));
for (size_t i = 1; i <= MATRIX_COUNT; ++i) for (int i = 1; i <= MATRIX_COUNT; ++i)
{ {
size_t src_size = (int)(std::pow(2.0, (rand()%MAX_DEGREE+1)*1.0)); size_t src_size = (int)(std::pow(2.0, (rand()%MAX_DEGREE+1)*1.0));
...@@ -305,7 +358,7 @@ bool Core_EigenTest::check_full(int type) ...@@ -305,7 +358,7 @@ bool Core_EigenTest::check_full(int type)
return true; return true;
} }
// TEST(Core_Eigen_Scalar_32, single_complex) {Core_EigenTest_Scalar_32 test; test.safe_run(); } // TEST(Core_Eigen_Scalar_32, accuracy) {Core_EigenTest_Scalar_32 test; test.safe_run(); }
// TEST(Core_Eigen_Scalar_64, single_complex) {Core_EigenTest_Scalar_64 test; test.safe_run(); } // TEST(Core_Eigen_Scalar_64, accuracy) {Core_EigenTest_Scalar_64 test; test.safe_run(); }
TEST(Core_Eigen_32, complex) { Core_EigenTest_32 test; test.safe_run(); } TEST(Core_Eigen_32, accuracy) { Core_EigenTest_32 test; test.safe_run(); }
TEST(Core_Eigen_64, complex) { Core_EigenTest_64 test; test.safe_run(); } TEST(Core_Eigen_64, accuracy) { Core_EigenTest_64 test; test.safe_run(); }
\ No newline at end of file
modules/imgproc/test/test_boundingrect.cpp
View file @ 07fa62f0
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include <time.h> #include <time.h>
#include <iostream>
#define IMGPROC_BOUNDINGRECT_ERROR_DIFF 1 #define IMGPROC_BOUNDINGRECT_ERROR_DIFF 1
...@@ -11,36 +10,36 @@ using namespace std; ...@@ -11,36 +10,36 @@ using namespace std;
class CV_BoundingRectTest: public cvtest::ArrayTest class CV_BoundingRectTest: public cvtest::ArrayTest
{ {
public: public:
CV_BoundingRectTest(); CV_BoundingRectTest();
~CV_BoundingRectTest(); ~CV_BoundingRectTest();
protected: protected:
void run (int); void run (int);
private: private:
template <class T> void generate_src_points(vector <Point_<T> >& src, int n); template <typename T> void generate_src_points(vector <Point_<T> >& src, int n);
template <class T> cv::Rect get_bounding_rect(const vector <Point_<T> > src); template <typename T> cv::Rect get_bounding_rect(const vector <Point_<T> > src);
template <class T> bool checking_function_work(vector <Point_<T> >& src, int type); template <typename T> bool checking_function_work(vector <Point_<T> >& src, int type);
}; };
CV_BoundingRectTest::CV_BoundingRectTest() {} CV_BoundingRectTest::CV_BoundingRectTest() {}
CV_BoundingRectTest::~CV_BoundingRectTest() {} CV_BoundingRectTest::~CV_BoundingRectTest() {}
template <class T> void CV_BoundingRectTest::generate_src_points(vector <Point_<T> >& src, int n) template <typename T> void CV_BoundingRectTest::generate_src_points(vector <Point_<T> >& src, int n)
{ {
src.clear(); src.clear();
for (size_t i = 0; i < n; ++i) for (int i = 0; i < n; ++i)
src.push_back(Point_<T>(cv::randu<T>(), cv::randu<T>())); src.push_back(Point_<T>(cv::randu<T>(), cv::randu<T>()));
} }
template <class T> cv::Rect CV_BoundingRectTest::get_bounding_rect(const vector <Point_<T> > src) template <typename T> cv::Rect CV_BoundingRectTest::get_bounding_rect(const vector <Point_<T> > src)
{ {
int n = src.size(); int n = src.size();
T min_w = std::numeric_limits<T>::max(), max_w = std::numeric_limits<T>::min(); T min_w = std::numeric_limits<T>::max(), max_w = std::numeric_limits<T>::min();
T min_h = min_w, max_h = max_w; T min_h = min_w, max_h = max_w;
for (size_t i = 0; i < n; ++i) for (int i = 0; i < n; ++i)
{ {
min_w = std::min<T>(src.at(i).x, min_w); min_w = std::min<T>(src.at(i).x, min_w);
max_w = std::max<T>(src.at(i).x, max_w); max_w = std::max<T>(src.at(i).x, max_w);
...@@ -51,7 +50,7 @@ template <class T> cv::Rect CV_BoundingRectTest::get_bounding_rect(const vector ...@@ -51,7 +50,7 @@ template <class T> cv::Rect CV_BoundingRectTest::get_bounding_rect(const vector
return Rect((int)min_w, (int)min_h, (int)(floor(1.0*(max_w-min_w)) + 1), (int)(floor(1.0*(max_h-min_h)) + 1)); return Rect((int)min_w, (int)min_h, (int)(floor(1.0*(max_w-min_w)) + 1), (int)(floor(1.0*(max_h-min_h)) + 1));
} }
template <class T> bool CV_BoundingRectTest::checking_function_work(vector <Point_<T> >& src, int type) template <typename T> bool CV_BoundingRectTest::checking_function_work(vector <Point_<T> >& src, int type)
{ {
const int MAX_COUNT_OF_POINTS = 1000; const int MAX_COUNT_OF_POINTS = 1000;
const int N = 10000; const int N = 10000;
...@@ -77,7 +76,6 @@ template <class T> bool CV_BoundingRectTest::checking_function_work(vector <Poin ...@@ -77,7 +76,6 @@ template <class T> bool CV_BoundingRectTest::checking_function_work(vector <Poin
{ {
case 0: {cout << "INT"; break;} case 0: {cout << "INT"; break;}
case 1: {cout << "FLOAT"; break;} case 1: {cout << "FLOAT"; break;}
case 2: {cout << "DOUBLE"; break;}
default: break; default: break;
} }
cout << endl; cout << endl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment