Merge pull request #3722 from mshabunin:fix-features2d-test

xfeatures2d: reduce test avg memory consumption
pull/3723/head^2
Alexander Smorkalov 1 year ago committed by GitHub
commit 5cc1a44863
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 126
      modules/xfeatures2d/test/test_rotation_and_scale_invariance.cpp

@ -17,56 +17,56 @@ static const char* const IMAGE_BIKES = "detectors_descriptors_evaluation/images_
#ifdef OPENCV_ENABLE_NONFREE
INSTANTIATE_TEST_CASE_P(SURF, DetectorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA, SURF::create(), 0.40f, 0.76f)
make_tuple(IMAGE_TSUKUBA, []() { return SURF::create(); }, 0.40f, 0.76f)
));
INSTANTIATE_TEST_CASE_P(SURF, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA, SURF::create(), SURF::create(), 0.83f)
make_tuple(IMAGE_TSUKUBA, []() { return SURF::create(); }, []() { return SURF::create(); }, 0.83f)
));
#endif // NONFREE
INSTANTIATE_TEST_CASE_P(LATCH, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA, SIFT::create(), LATCH::create(), 0.98f)
make_tuple(IMAGE_TSUKUBA, []() { return SIFT::create(); }, []() { return LATCH::create(); }, 0.98f)
));
INSTANTIATE_TEST_CASE_P(BEBLID, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA, SIFT::create(), BEBLID::create(6.75), 0.98f)
make_tuple(IMAGE_TSUKUBA, []() { return SIFT::create(); }, []() { return BEBLID::create(6.75); }, 0.98f)
));
INSTANTIATE_TEST_CASE_P(TEBLID, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA, SIFT::create(), TEBLID::create(6.75), 0.98f)
make_tuple(IMAGE_TSUKUBA, []() { return SIFT::create(); }, []() { return TEBLID::create(6.75); }, 0.98f)
));
INSTANTIATE_TEST_CASE_P(DAISY, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
BRISK::create(),
DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true),
[]() { return BRISK::create(); },
[]() { return DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true); },
0.79f)
));
#ifdef OPENCV_XFEATURES2D_HAS_VGG_DATA
INSTANTIATE_TEST_CASE_P(VGG120, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
KAZE::create(),
VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false); },
0.97f)
));
INSTANTIATE_TEST_CASE_P(VGG80, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
KAZE::create(),
VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false); },
0.97f)
));
INSTANTIATE_TEST_CASE_P(VGG64, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
KAZE::create(),
VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false); },
0.97f)
));
INSTANTIATE_TEST_CASE_P(VGG48, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
KAZE::create(),
VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false); },
0.97f)
));
#endif // OPENCV_XFEATURES2D_HAS_VGG_DATA
@ -75,79 +75,79 @@ INSTANTIATE_TEST_CASE_P(VGG48, DescriptorRotationInvariance, Values(
INSTANTIATE_TEST_CASE_P(BRIEF_64, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BriefDescriptorExtractor::create(64,true),
[]() { return SURF::create(); },
[]() { return BriefDescriptorExtractor::create(64,true); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(BRIEF_32, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BriefDescriptorExtractor::create(32,true),
[]() { return SURF::create(); },
[]() { return BriefDescriptorExtractor::create(32,true); },
0.97f)
));
INSTANTIATE_TEST_CASE_P(BRIEF_16, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BriefDescriptorExtractor::create(16, true),
[]() { return SURF::create(); },
[]() { return BriefDescriptorExtractor::create(16, true); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(FREAK, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
FREAK::create(),
[]() { return SURF::create(); },
[]() { return FREAK::create(); },
0.90f)
));
#ifdef OPENCV_XFEATURES2D_HAS_BOOST_DATA
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BoostDesc::create(BoostDesc::BGM, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BGM, true, 6.25f); },
0.999f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_HARD, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_BILINEAR, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_LBGM, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BoostDesc::create(BoostDesc::LBGM, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::LBGM, true, 6.25f); },
0.999f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_64, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_128, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_256, DescriptorRotationInvariance, Values(
make_tuple(IMAGE_TSUKUBA,
SURF::create(),
BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f); },
0.999f)
));
#endif // OPENCV_XFEATURES2D_HAS_BOOST_DATA
@ -159,11 +159,11 @@ INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_256, DescriptorRotationInvariance, Va
#ifdef OPENCV_ENABLE_NONFREE
INSTANTIATE_TEST_CASE_P(SURF, DetectorScaleInvariance, Values(
make_tuple(IMAGE_BIKES, SURF::create(), 0.64f, 0.84f)
make_tuple(IMAGE_BIKES, []() { return SURF::create(); }, 0.64f, 0.84f)
));
INSTANTIATE_TEST_CASE_P(SURF, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES, SURF::create(), SURF::create(), 0.7f)
make_tuple(IMAGE_BIKES, []() { return SURF::create(); }, []() { return SURF::create(); }, 0.7f)
));
#endif // NONFREE
@ -171,8 +171,8 @@ INSTANTIATE_TEST_CASE_P(SURF, DescriptorScaleInvariance, Values(
#if 0 // DAISY is not scale invariant
INSTANTIATE_TEST_CASE_P(DISABLED_DAISY, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
BRISK::create(),
DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true),
[]() { return BRISK::create(); },
[]() { return DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true); },
0.1f)
));
#endif
@ -180,26 +180,26 @@ INSTANTIATE_TEST_CASE_P(DISABLED_DAISY, DescriptorScaleInvariance, Values(
#ifdef OPENCV_XFEATURES2D_HAS_VGG_DATA
INSTANTIATE_TEST_CASE_P(VGG120, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
KAZE::create(),
VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(VGG80, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
KAZE::create(),
VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(VGG64, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
KAZE::create(),
VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false); },
0.97f)
));
INSTANTIATE_TEST_CASE_P(VGG48, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
KAZE::create(),
VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false),
[]() { return KAZE::create(); },
[]() { return VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false); },
0.93f)
));
#endif // OPENCV_XFEATURES2D_HAS_VGG_DATA
@ -208,44 +208,44 @@ INSTANTIATE_TEST_CASE_P(VGG48, DescriptorScaleInvariance, Values(
#ifdef OPENCV_XFEATURES2D_HAS_BOOST_DATA
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
SURF::create(),
BoostDesc::create(BoostDesc::BGM, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BGM, true, 6.25f); },
0.98f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_HARD, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
SURF::create(),
BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f); },
0.75f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_BILINEAR, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
SURF::create(),
BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f); },
0.95f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_LBGM, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
SURF::create(),
BoostDesc::create(BoostDesc::LBGM, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::LBGM, true, 6.25f); },
0.95f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_64, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
SURF::create(),
BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f); },
0.75f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_128, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
SURF::create(),
BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f); },
0.95f)
));
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_256, DescriptorScaleInvariance, Values(
make_tuple(IMAGE_BIKES,
SURF::create(),
BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f),
[]() { return SURF::create(); },
[]() { return BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f); },
0.98f)
));
#endif // OPENCV_XFEATURES2D_HAS_BOOST_DATA

Loading…
Cancel
Save