generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed tests for scale invariance (uncommented sift test, it's ok now)

Browse Source
This commit is contained in:
Maria Dimashova 2012-07-16 16:21:40 +00:00
parent ea96047f78
commit cfeb28f2ba
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/features2d/test/test_rotation_and_scale_invariance.cpp
View File

@ -108,7 +108,7 @@ void scaleKeyPoints(const vector<KeyPoint>& src, vector<KeyPoint>& dst, float sc
{ {
dst.resize(src.size()); dst.resize(src.size());
for(size_t i = 0; i < src.size(); i++) for(size_t i = 0; i < src.size(); i++)
dst[i] = KeyPoint(src[i].pt.x * scale, src[i].pt.y * scale, src[i].size * scale); dst[i] = KeyPoint(src[i].pt.x * scale, src[i].pt.y * scale, src[i].size * scale, src[i].angle);
} }
static static
@ -415,7 +415,7 @@ protected:
if(keypoints0.size() < 15) if(keypoints0.size() < 15)
CV_Error(CV_StsAssert, "Detector gives too few points in a test image\n"); CV_Error(CV_StsAssert, "Detector gives too few points in a test image\n");
for(float scaleIdx = 1; scaleIdx <= 3; scaleIdx++) for(int scaleIdx = 1; scaleIdx <= 3; scaleIdx++)
{ {
float scale = 1.f + scaleIdx * 0.5f; float scale = 1.f + scaleIdx * 0.5f;
Mat image1; Mat image1;
@ -537,7 +537,7 @@ protected:
descriptorExtractor->compute(image0, keypoints0, descriptors0); descriptorExtractor->compute(image0, keypoints0, descriptors0);
BFMatcher bfmatcher(normType); BFMatcher bfmatcher(normType);
for(float scaleIdx = 1; scaleIdx <= 3; scaleIdx++) for(int scaleIdx = 1; scaleIdx <= 3; scaleIdx++)
{ {
float scale = 1.f + scaleIdx * 0.5f; float scale = 1.f + scaleIdx * 0.5f;

28
modules/nonfree/test/test_rotation_and_scale_invariance.cpp
View File

@ -108,7 +108,7 @@ void scaleKeyPoints(const vector<KeyPoint>& src, vector<KeyPoint>& dst, float sc
{ {
dst.resize(src.size()); dst.resize(src.size());
for(size_t i = 0; i < src.size(); i++) for(size_t i = 0; i < src.size(); i++)
dst[i] = KeyPoint(src[i].pt.x * scale, src[i].pt.y * scale, src[i].size * scale); dst[i] = KeyPoint(src[i].pt.x * scale, src[i].pt.y * scale, src[i].size * scale, src[i].angle);
} }
static static
@ -415,7 +415,7 @@ protected:
if(keypoints0.size() < 15) if(keypoints0.size() < 15)
CV_Error(CV_StsAssert, "Detector gives too few points in a test image\n"); CV_Error(CV_StsAssert, "Detector gives too few points in a test image\n");
for(float scaleIdx = 1; scaleIdx <= 3; scaleIdx++) for(int scaleIdx = 1; scaleIdx <= 3; scaleIdx++)
{ {
float scale = 1.f + scaleIdx * 0.5f; float scale = 1.f + scaleIdx * 0.5f;
Mat image1; Mat image1;
@ -537,7 +537,7 @@ protected:
descriptorExtractor->compute(image0, keypoints0, descriptors0); descriptorExtractor->compute(image0, keypoints0, descriptors0);
BFMatcher bfmatcher(normType); BFMatcher bfmatcher(normType);
for(float scaleIdx = 1; scaleIdx <= 3; scaleIdx++) for(int scaleIdx = 1; scaleIdx <= 3; scaleIdx++)
{ {
float scale = 1.f + scaleIdx * 0.5f; float scale = 1.f + scaleIdx * 0.5f;
@ -654,17 +654,17 @@ TEST(Features2d_ScaleInvariance_Detector_SIFT, regression)
TEST(Features2d_ScaleInvariance_Descriptor_SURF, regression) TEST(Features2d_ScaleInvariance_Descriptor_SURF, regression)
{ {
DescriptorScaleInvarianceTest test(Algorithm::create<FeatureDetector>("Feature2D.SURF"), DescriptorScaleInvarianceTest test(Algorithm::create<FeatureDetector>("Feature2D.SURF"),
Algorithm::create<DescriptorExtractor>("Feature2D.SURF"), Algorithm::create<DescriptorExtractor>("Feature2D.SURF"),
NORM_L1, NORM_L1,
0.61f); 0.61f);
test.safe_run(); test.safe_run();
} }
//TEST(Features2d_ScaleInvariance_Descriptor_SIFT, regression) TEST(Features2d_ScaleInvariance_Descriptor_SIFT, regression)
//{ {
// DescriptorScaleInvarianceTest test(Algorithm::create<FeatureDetector>("Feature2D.SIFT"), DescriptorScaleInvarianceTest test(Algorithm::create<FeatureDetector>("Feature2D.SIFT"),
// Algorithm::create<DescriptorExtractor>("Feature2D.SIFT"), Algorithm::create<DescriptorExtractor>("Feature2D.SIFT"),
// NORM_L1, NORM_L1,
// 0.14f); 0.87f);
// test.safe_run(); test.safe_run();
//} }