Skip to content

Commit 5cc1a44

Browse files
asmorkalovasmorkalov
authored
Merge pull request #3722 from mshabunin:fix-features2d-test
xfeatures2d: reduce test avg memory consumption
2 parents 0658ab2 + a2ba3e9 commit 5cc1a44

File tree

1 file changed

+63
-63
lines changed

1 file changed

+63
-63
lines changed

‎modules/xfeatures2d/test/test_rotation_and_scale_invariance.cpp‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -17,56 +17,56 @@ static const char* const IMAGE_BIKES = "detectors_descriptors_evaluation/images_
1717
#ifdef OPENCV_ENABLE_NONFREE
1818

1919
INSTANTIATE_TEST_CASE_P(SURF, DetectorRotationInvariance, Values(
20-
make_tuple(IMAGE_TSUKUBA, SURF::create(), 0.40f, 0.76f)
20+
make_tuple(IMAGE_TSUKUBA, []() { return SURF::create(); }, 0.40f, 0.76f)
2121
));
2222

2323
INSTANTIATE_TEST_CASE_P(SURF, DescriptorRotationInvariance, Values(
24-
make_tuple(IMAGE_TSUKUBA, SURF::create(), SURF::create(), 0.83f)
24+
make_tuple(IMAGE_TSUKUBA, []() { return SURF::create(); }, []() { return SURF::create(); }, 0.83f)
2525
));
2626

2727
#endif // NONFREE
2828

2929
INSTANTIATE_TEST_CASE_P(LATCH, DescriptorRotationInvariance, Values(
30-
make_tuple(IMAGE_TSUKUBA, SIFT::create(), LATCH::create(), 0.98f)
30+
make_tuple(IMAGE_TSUKUBA, []() { return SIFT::create(); }, []() { return LATCH::create(); }, 0.98f)
3131
));
3232

3333
INSTANTIATE_TEST_CASE_P(BEBLID, DescriptorRotationInvariance, Values(
34-
make_tuple(IMAGE_TSUKUBA, SIFT::create(), BEBLID::create(6.75), 0.98f)
34+
make_tuple(IMAGE_TSUKUBA, []() { return SIFT::create(); }, []() { return BEBLID::create(6.75); }, 0.98f)
3535
));
3636

3737
INSTANTIATE_TEST_CASE_P(TEBLID, DescriptorRotationInvariance, Values(
38-
make_tuple(IMAGE_TSUKUBA, SIFT::create(), TEBLID::create(6.75), 0.98f)
38+
make_tuple(IMAGE_TSUKUBA, []() { return SIFT::create(); }, []() { return TEBLID::create(6.75); }, 0.98f)
3939
));
4040

4141
INSTANTIATE_TEST_CASE_P(DAISY, DescriptorRotationInvariance, Values(
4242
make_tuple(IMAGE_TSUKUBA,
43-
BRISK::create(),
44-
DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true),
43+
[]() { return BRISK::create(); },
44+
[]() { return DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true); },
4545
0.79f)
4646
));
4747
#ifdef OPENCV_XFEATURES2D_HAS_VGG_DATA
4848
INSTANTIATE_TEST_CASE_P(VGG120, DescriptorRotationInvariance, Values(
4949
make_tuple(IMAGE_TSUKUBA,
50-
KAZE::create(),
51-
VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false),
50+
[]() { return KAZE::create(); },
51+
[]() { return VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false); },
5252
0.97f)
5353
));
5454
INSTANTIATE_TEST_CASE_P(VGG80, DescriptorRotationInvariance, Values(
5555
make_tuple(IMAGE_TSUKUBA,
56-
KAZE::create(),
57-
VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false),
56+
[]() { return KAZE::create(); },
57+
[]() { return VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false); },
5858
0.97f)
5959
));
6060
INSTANTIATE_TEST_CASE_P(VGG64, DescriptorRotationInvariance, Values(
6161
make_tuple(IMAGE_TSUKUBA,
62-
KAZE::create(),
63-
VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false),
62+
[]() { return KAZE::create(); },
63+
[]() { return VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false); },
6464
0.97f)
6565
));
6666
INSTANTIATE_TEST_CASE_P(VGG48, DescriptorRotationInvariance, Values(
6767
make_tuple(IMAGE_TSUKUBA,
68-
KAZE::create(),
69-
VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false),
68+
[]() { return KAZE::create(); },
69+
[]() { return VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false); },
7070
0.97f)
7171
));
7272
#endif // OPENCV_XFEATURES2D_HAS_VGG_DATA
@@ -75,79 +75,79 @@ INSTANTIATE_TEST_CASE_P(VGG48, DescriptorRotationInvariance, Values(
7575

7676
INSTANTIATE_TEST_CASE_P(BRIEF_64, DescriptorRotationInvariance, Values(
7777
make_tuple(IMAGE_TSUKUBA,
78-
SURF::create(),
79-
BriefDescriptorExtractor::create(64,true),
78+
[]() { return SURF::create(); },
79+
[]() { return BriefDescriptorExtractor::create(64,true); },
8080
0.98f)
8181
));
8282

8383
INSTANTIATE_TEST_CASE_P(BRIEF_32, DescriptorRotationInvariance, Values(
8484
make_tuple(IMAGE_TSUKUBA,
85-
SURF::create(),
86-
BriefDescriptorExtractor::create(32,true),
85+
[]() { return SURF::create(); },
86+
[]() { return BriefDescriptorExtractor::create(32,true); },
8787
0.97f)
8888
));
8989

9090
INSTANTIATE_TEST_CASE_P(BRIEF_16, DescriptorRotationInvariance, Values(
9191
make_tuple(IMAGE_TSUKUBA,
92-
SURF::create(),
93-
BriefDescriptorExtractor::create(16, true),
92+
[]() { return SURF::create(); },
93+
[]() { return BriefDescriptorExtractor::create(16, true); },
9494
0.98f)
9595
));
9696

9797
INSTANTIATE_TEST_CASE_P(FREAK, DescriptorRotationInvariance, Values(
9898
make_tuple(IMAGE_TSUKUBA,
99-
SURF::create(),
100-
FREAK::create(),
99+
[]() { return SURF::create(); },
100+
[]() { return FREAK::create(); },
101101
0.90f)
102102
));
103103

104104
#ifdef OPENCV_XFEATURES2D_HAS_BOOST_DATA
105105
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM, DescriptorRotationInvariance, Values(
106106
make_tuple(IMAGE_TSUKUBA,
107-
SURF::create(),
108-
BoostDesc::create(BoostDesc::BGM, true, 6.25f),
107+
[]() { return SURF::create(); },
108+
[]() { return BoostDesc::create(BoostDesc::BGM, true, 6.25f); },
109109
0.999f)
110110
));
111111

112112
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_HARD, DescriptorRotationInvariance, Values(
113113
make_tuple(IMAGE_TSUKUBA,
114-
SURF::create(),
115-
BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f),
114+
[]() { return SURF::create(); },
115+
[]() { return BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f); },
116116
0.98f)
117117
));
118118

119119
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_BILINEAR, DescriptorRotationInvariance, Values(
120120
make_tuple(IMAGE_TSUKUBA,
121-
SURF::create(),
122-
BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f),
121+
[]() { return SURF::create(); },
122+
[]() { return BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f); },
123123
0.98f)
124124
));
125125

126126
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_LBGM, DescriptorRotationInvariance, Values(
127127
make_tuple(IMAGE_TSUKUBA,
128-
SURF::create(),
129-
BoostDesc::create(BoostDesc::LBGM, true, 6.25f),
128+
[]() { return SURF::create(); },
129+
[]() { return BoostDesc::create(BoostDesc::LBGM, true, 6.25f); },
130130
0.999f)
131131
));
132132

133133
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_64, DescriptorRotationInvariance, Values(
134134
make_tuple(IMAGE_TSUKUBA,
135-
SURF::create(),
136-
BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f),
135+
[]() { return SURF::create(); },
136+
[]() { return BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f); },
137137
0.98f)
138138
));
139139

140140
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_128, DescriptorRotationInvariance, Values(
141141
make_tuple(IMAGE_TSUKUBA,
142-
SURF::create(),
143-
BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f),
142+
[]() { return SURF::create(); },
143+
[]() { return BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f); },
144144
0.98f)
145145
));
146146

147147
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_256, DescriptorRotationInvariance, Values(
148148
make_tuple(IMAGE_TSUKUBA,
149-
SURF::create(),
150-
BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f),
149+
[]() { return SURF::create(); },
150+
[]() { return BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f); },
151151
0.999f)
152152
));
153153
#endif // OPENCV_XFEATURES2D_HAS_BOOST_DATA
@@ -159,47 +159,47 @@ INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_256, DescriptorRotationInvariance, Va
159159

160160
#ifdef OPENCV_ENABLE_NONFREE
161161
INSTANTIATE_TEST_CASE_P(SURF, DetectorScaleInvariance, Values(
162-
make_tuple(IMAGE_BIKES, SURF::create(), 0.64f, 0.84f)
162+
make_tuple(IMAGE_BIKES, []() { return SURF::create(); }, 0.64f, 0.84f)
163163
));
164164

165165
INSTANTIATE_TEST_CASE_P(SURF, DescriptorScaleInvariance, Values(
166-
make_tuple(IMAGE_BIKES, SURF::create(), SURF::create(), 0.7f)
166+
make_tuple(IMAGE_BIKES, []() { return SURF::create(); }, []() { return SURF::create(); }, 0.7f)
167167
));
168168
#endif // NONFREE
169169

170170

171171
#if 0 // DAISY is not scale invariant
172172
INSTANTIATE_TEST_CASE_P(DISABLED_DAISY, DescriptorScaleInvariance, Values(
173173
make_tuple(IMAGE_BIKES,
174-
BRISK::create(),
175-
DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true),
174+
[]() { return BRISK::create(); },
175+
[]() { return DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true); },
176176
0.1f)
177177
));
178178
#endif
179179

180180
#ifdef OPENCV_XFEATURES2D_HAS_VGG_DATA
181181
INSTANTIATE_TEST_CASE_P(VGG120, DescriptorScaleInvariance, Values(
182182
make_tuple(IMAGE_BIKES,
183-
KAZE::create(),
184-
VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false),
183+
[]() { return KAZE::create(); },
184+
[]() { return VGG::create(VGG::VGG_120, 1.4f, true, true, 48.0f, false); },
185185
0.98f)
186186
));
187187
INSTANTIATE_TEST_CASE_P(VGG80, DescriptorScaleInvariance, Values(
188188
make_tuple(IMAGE_BIKES,
189-
KAZE::create(),
190-
VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false),
189+
[]() { return KAZE::create(); },
190+
[]() { return VGG::create(VGG::VGG_80, 1.4f, true, true, 48.0f, false); },
191191
0.98f)
192192
));
193193
INSTANTIATE_TEST_CASE_P(VGG64, DescriptorScaleInvariance, Values(
194194
make_tuple(IMAGE_BIKES,
195-
KAZE::create(),
196-
VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false),
195+
[]() { return KAZE::create(); },
196+
[]() { return VGG::create(VGG::VGG_64, 1.4f, true, true, 48.0f, false); },
197197
0.97f)
198198
));
199199
INSTANTIATE_TEST_CASE_P(VGG48, DescriptorScaleInvariance, Values(
200200
make_tuple(IMAGE_BIKES,
201-
KAZE::create(),
202-
VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false),
201+
[]() { return KAZE::create(); },
202+
[]() { return VGG::create(VGG::VGG_48, 1.4f, true, true, 48.0f, false); },
203203
0.93f)
204204
));
205205
#endif // OPENCV_XFEATURES2D_HAS_VGG_DATA
@@ -208,44 +208,44 @@ INSTANTIATE_TEST_CASE_P(VGG48, DescriptorScaleInvariance, Values(
208208
#ifdef OPENCV_XFEATURES2D_HAS_BOOST_DATA
209209
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM, DescriptorScaleInvariance, Values(
210210
make_tuple(IMAGE_BIKES,
211-
SURF::create(),
212-
BoostDesc::create(BoostDesc::BGM, true, 6.25f),
211+
[]() { return SURF::create(); },
212+
[]() { return BoostDesc::create(BoostDesc::BGM, true, 6.25f); },
213213
0.98f)
214214
));
215215
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_HARD, DescriptorScaleInvariance, Values(
216216
make_tuple(IMAGE_BIKES,
217-
SURF::create(),
218-
BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f),
217+
[]() { return SURF::create(); },
218+
[]() { return BoostDesc::create(BoostDesc::BGM_HARD, true, 6.25f); },
219219
0.75f)
220220
));
221221
INSTANTIATE_TEST_CASE_P(BoostDesc_BGM_BILINEAR, DescriptorScaleInvariance, Values(
222222
make_tuple(IMAGE_BIKES,
223-
SURF::create(),
224-
BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f),
223+
[]() { return SURF::create(); },
224+
[]() { return BoostDesc::create(BoostDesc::BGM_BILINEAR, true, 6.25f); },
225225
0.95f)
226226
));
227227
INSTANTIATE_TEST_CASE_P(BoostDesc_LBGM, DescriptorScaleInvariance, Values(
228228
make_tuple(IMAGE_BIKES,
229-
SURF::create(),
230-
BoostDesc::create(BoostDesc::LBGM, true, 6.25f),
229+
[]() { return SURF::create(); },
230+
[]() { return BoostDesc::create(BoostDesc::LBGM, true, 6.25f); },
231231
0.95f)
232232
));
233233
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_64, DescriptorScaleInvariance, Values(
234234
make_tuple(IMAGE_BIKES,
235-
SURF::create(),
236-
BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f),
235+
[]() { return SURF::create(); },
236+
[]() { return BoostDesc::create(BoostDesc::BINBOOST_64, true, 6.25f); },
237237
0.75f)
238238
));
239239
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_128, DescriptorScaleInvariance, Values(
240240
make_tuple(IMAGE_BIKES,
241-
SURF::create(),
242-
BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f),
241+
[]() { return SURF::create(); },
242+
[]() { return BoostDesc::create(BoostDesc::BINBOOST_128, true, 6.25f); },
243243
0.95f)
244244
));
245245
INSTANTIATE_TEST_CASE_P(BoostDesc_BINBOOST_256, DescriptorScaleInvariance, Values(
246246
make_tuple(IMAGE_BIKES,
247-
SURF::create(),
248-
BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f),
247+
[]() { return SURF::create(); },
248+
[]() { return BoostDesc::create(BoostDesc::BINBOOST_256, true, 6.25f); },
249249
0.98f)
250250
));
251251
#endif // OPENCV_XFEATURES2D_HAS_BOOST_DATA

0 commit comments

Comments
 (0)