Change DescriptorExtractor_ORB regression test

to compensate for neon ieee754 non-compliancy.
Also changed the comparison between max valid and calculated distance to
make the error message more accurate (in case curMaxDist == maxDist)
This commit is contained in:
orestis 2014-12-21 21:27:03 +02:00
parent 9811a739b0
commit fffe2464cd

View File

@ -132,7 +132,7 @@ protected:
stringstream ss; stringstream ss;
ss << "Max distance between valid and computed descriptors " << curMaxDist; ss << "Max distance between valid and computed descriptors " << curMaxDist;
if( curMaxDist < maxDist ) if( curMaxDist <= maxDist )
ss << "." << endl; ss << "." << endl;
else else
{ {
@ -322,7 +322,11 @@ TEST( Features2d_DescriptorExtractor_ORB, regression )
{ {
// TODO adjust the parameters below // TODO adjust the parameters below
CV_DescriptorExtractorTest<Hamming> test( "descriptor-orb", CV_DescriptorExtractorTest<Hamming> test( "descriptor-orb",
#if CV_NEON
(CV_DescriptorExtractorTest<Hamming>::DistanceType)25.f,
#else
(CV_DescriptorExtractorTest<Hamming>::DistanceType)12.f, (CV_DescriptorExtractorTest<Hamming>::DistanceType)12.f,
#endif
ORB::create() ); ORB::create() );
test.safe_run(); test.safe_run();
} }