Merge pull request #1286 from alalek:fix_sift_test

alalek · alalek · commit ffdec47924cc · 2017-07-21T04:57:38.000Z
diff --git a/modules/xfeatures2d/test/test_features2d.cpp b/modules/xfeatures2d/test/test_features2d.cpp
@@ -327,7 +327,7 @@ class CV_DescriptorExtractorTest : public cvtest::BaseTest
 
         stringstream ss;
         ss << "Max distance between valid and computed descriptors " << curMaxDist;
-        if( curMaxDist < maxDist )
+        if( curMaxDist <= maxDist )
             ss << "." << endl;
         else
         {
@@ -1020,7 +1020,7 @@ TEST( Features2d_Detector_Harris_Laplace_Affine, regression )
  */
 TEST( Features2d_DescriptorExtractor_SIFT, regression )
 {
-    CV_DescriptorExtractorTest<L2<float> > test( "descriptor-sift", 0.03f,
+    CV_DescriptorExtractorTest<L1<float> > test( "descriptor-sift", 1.0f,
                                                 SIFT::create() );
     test.safe_run();
 }

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ class CV_DescriptorExtractorTest : public cvtest::BaseTest`
`327`	`327`
`328`	`328`	`stringstream ss;`
`329`	`329`	`ss << "Max distance between valid and computed descriptors " << curMaxDist;`
`330`		`- if( curMaxDist < maxDist )`
	`330`	`+ if( curMaxDist <= maxDist )`
`331`	`331`	`ss << "." << endl;`
`332`	`332`	`else`
`333`	`333`	`{`
`@@ -1020,7 +1020,7 @@ TEST( Features2d_Detector_Harris_Laplace_Affine, regression )`
`1020`	`1020`	`*/`
`1021`	`1021`	`TEST( Features2d_DescriptorExtractor_SIFT, regression )`
`1022`	`1022`	`{`
`1023`		`- CV_DescriptorExtractorTest<L2<float> > test( "descriptor-sift", 0.03f,`
	`1023`	`+ CV_DescriptorExtractorTest<L1<float> > test( "descriptor-sift", 1.0f,`
`1024`	`1024`	`SIFT::create() );`
`1025`	`1025`	`test.safe_run();`
`1026`	`1026`	`}`