features2d(sift): move SIFT tests / headers / build fixes

modules/features2d/test/test_descriptors_invariance.cpp

@@ -167,6 +167,9 @@ TEST_P(DescriptorScaleInvariance, scale)
  * Descriptors's rotation invariance check
  */
 
+INSTANTIATE_TEST_CASE_P(SIFT, DescriptorRotationInvariance,
+                        Value(IMAGE_TSUKUBA, SIFT::create(), SIFT::create(), 0.98f));
+
 INSTANTIATE_TEST_CASE_P(BRISK, DescriptorRotationInvariance,
                         Value(IMAGE_TSUKUBA, BRISK::create(), BRISK::create(), 0.99f));
 
@@ -183,6 +186,10 @@ INSTANTIATE_TEST_CASE_P(AKAZE_DESCRIPTOR_KAZE, DescriptorRotationInvariance,
  * Descriptor's scale invariance check
  */
 
+// TODO: Expected: (descInliersRatio) >= (minInliersRatio), actual: 0.330378 vs 0.78
+INSTANTIATE_TEST_CASE_P(DISABLED_SIFT, DescriptorScaleInvariance,
+                        Value(IMAGE_BIKES, SIFT::create(), SIFT::create(), 0.78f));
+
 INSTANTIATE_TEST_CASE_P(AKAZE, DescriptorScaleInvariance,
                         Value(IMAGE_BIKES, AKAZE::create(), AKAZE::create(), 0.6f));
 

modules/features2d/test/test_descriptors_regression.cpp

@@ -342,6 +342,13 @@ private:
 *                                Tests registrations                                     *
 \****************************************************************************************/
 
+TEST( Features2d_DescriptorExtractor_SIFT, regression )
+{
+    CV_DescriptorExtractorTest<L1<float> > test( "descriptor-sift", 1.0f,
+                                                SIFT::create() );
+    test.safe_run();
+}
+
 TEST( Features2d_DescriptorExtractor_BRISK, regression )
 {
     CV_DescriptorExtractorTest<Hamming> test( "descriptor-brisk",
@@ -388,7 +395,7 @@ TEST( Features2d_DescriptorExtractor_AKAZE_DESCRIPTOR_KAZE, regression )
     test.safe_run();
 }
 
-TEST( Features2d_DescriptorExtractor, batch )
+TEST( Features2d_DescriptorExtractor, batch_ORB )
 {
     string path = string(cvtest::TS::ptr()->get_data_path() + "detectors_descriptors_evaluation/images_datasets/graf");
     vector<Mat> imgs, descriptors;
@@ -416,6 +423,35 @@ TEST( Features2d_DescriptorExtractor, batch )
     }
 }
 
+TEST( Features2d_DescriptorExtractor, batch_SIFT )
+{
+    string path = string(cvtest::TS::ptr()->get_data_path() + "detectors_descriptors_evaluation/images_datasets/graf");
+    vector<Mat> imgs, descriptors;
+    vector<vector<KeyPoint> > keypoints;
+    int i, n = 6;
+    Ptr<SIFT> sift = SIFT::create();
+
+    for( i = 0; i < n; i++ )
+    {
+        string imgname = format("%s/img%d.png", path.c_str(), i+1);
+        Mat img = imread(imgname, 0);
+        imgs.push_back(img);
+    }
+
+    sift->detect(imgs, keypoints);
+    sift->compute(imgs, keypoints, descriptors);
+
+    ASSERT_EQ((int)keypoints.size(), n);
+    ASSERT_EQ((int)descriptors.size(), n);
+
+    for( i = 0; i < n; i++ )
+    {
+        EXPECT_GT((int)keypoints[i].size(), 100);
+        EXPECT_GT(descriptors[i].rows, 100);
+    }
+}
+
+
 class DescriptorImage : public TestWithParam<std::string>
 {
 protected:

modules/features2d/test/test_detectors_invariance.cpp

@@ -220,6 +220,9 @@ TEST_P(DetectorScaleInvariance, scale)
  * Detector's rotation invariance check
  */
 
+INSTANTIATE_TEST_CASE_P(SIFT, DetectorRotationInvariance,
+                        Value(IMAGE_TSUKUBA, SIFT::create(), 0.45f, 0.70f));
+
 INSTANTIATE_TEST_CASE_P(BRISK, DetectorRotationInvariance,
                         Value(IMAGE_TSUKUBA, BRISK::create(), 0.45f, 0.76f));
 
@@ -236,6 +239,10 @@ INSTANTIATE_TEST_CASE_P(AKAZE_DESCRIPTOR_KAZE, DetectorRotationInvariance,
  * Detector's scale invariance check
  */
 
+// TODO: Expected: (keyPointMatchesRatio) >= (minKeyPointMatchesRatio), actual: 0.596752 vs 0.69
+INSTANTIATE_TEST_CASE_P(DISABLED_SIFT, DetectorScaleInvariance,
+                        Value(IMAGE_BIKES, SIFT::create(), 0.69f, 0.98f));
+
 INSTANTIATE_TEST_CASE_P(BRISK, DetectorScaleInvariance,
                         Value(IMAGE_BIKES, BRISK::create(), 0.08f, 0.49f));
 

modules/features2d/test/test_detectors_regression.cpp

@@ -245,6 +245,12 @@ void CV_FeatureDetectorTest::run( int /*start_from*/ )
 *                                Tests registrations                                     *
 \****************************************************************************************/
 
+TEST( Features2d_Detector_SIFT, regression )
+{
+    CV_FeatureDetectorTest test( "detector-sift", SIFT::create() );
+    test.safe_run();
+}
+
 TEST( Features2d_Detector_BRISK, regression )
 {
     CV_FeatureDetectorTest test( "detector-brisk", BRISK::create() );

modules/features2d/test/test_keypoints.cpp

@@ -177,4 +177,11 @@ TEST(Features2d_Detector_Keypoints_AKAZE, validation)
     test_mldb.safe_run();
 }
 
+TEST(Features2d_Detector_Keypoints_SIFT, validation)
+{
+    CV_FeatureDetectorKeypointsTest test(SIFT::create());
+    test.safe_run();
+}
+
+
 }} // namespace