generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed obsolete parameter 'time' in regression test for descriptors

Browse Source
This commit is contained in:
Maria Dimashova 2012-07-02 12:44:41 +00:00
parent 9cd0c9033f
commit 52ba2e45c4
1 changed files with 7 additions and 8 deletions

15
modules/nonfree/test/test_features2d.cpp

@ -291,9 +291,9 @@ public:
typedef typename Distance::ValueType ValueType; typedef typename Distance::ValueType ValueType;
typedef typename Distance::ResultType DistanceType; typedef typename Distance::ResultType DistanceType;
CV_DescriptorExtractorTest( const string _name, DistanceType _maxDist, const Ptr<DescriptorExtractor>& _dextractor, float _prevTime, CV_DescriptorExtractorTest( const string _name, DistanceType _maxDist, const Ptr<DescriptorExtractor>& _dextractor,
Distance d = Distance() ): Distance d = Distance() ):
name(_name), maxDist(_maxDist), prevTime(_prevTime), dextractor(_dextractor), distance(d) {} name(_name), maxDist(_maxDist), dextractor(_dextractor), distance(d) {}
protected: protected:
virtual void createDescriptorExtractor() {} virtual void createDescriptorExtractor() {}
@ -401,7 +401,7 @@ protected:
double t = (double)getTickCount(); double t = (double)getTickCount();
dextractor->compute( img, keypoints, calcDescriptors ); dextractor->compute( img, keypoints, calcDescriptors );
t = getTickCount() - t; t = getTickCount() - t;
ts->printf(cvtest::TS::LOG, "\nAverage time of computing one descriptor = %g ms (previous time = %g ms).\n", t/((double)cvGetTickFrequency()*1000.)/calcDescriptors.rows, prevTime ); ts->printf(cvtest::TS::LOG, "\nAverage time of computing one descriptor = %g ms.\n", t/((double)cvGetTickFrequency()*1000.)/calcDescriptors.rows );
if( calcDescriptors.rows != (int)keypoints.size() ) if( calcDescriptors.rows != (int)keypoints.size() )
{ {
@ -486,7 +486,6 @@ protected:
string name; string name;
const DistanceType maxDist; const DistanceType maxDist;
const float prevTime;
Ptr<DescriptorExtractor> dextractor; Ptr<DescriptorExtractor> dextractor;
Distance distance; Distance distance;
@ -988,28 +987,28 @@ TEST( Features2d_Detector_SURF, regression )
TEST( Features2d_DescriptorExtractor_SIFT, regression ) TEST( Features2d_DescriptorExtractor_SIFT, regression )
{ {
CV_DescriptorExtractorTest<L2<float> > test( "descriptor-sift", 0.03f, CV_DescriptorExtractorTest<L2<float> > test( "descriptor-sift", 0.03f,
DescriptorExtractor::create("SIFT"), 8.06652f ); DescriptorExtractor::create("SIFT") );
test.safe_run(); test.safe_run();
} }
TEST( Features2d_DescriptorExtractor_SURF, regression ) TEST( Features2d_DescriptorExtractor_SURF, regression )
{ {
CV_DescriptorExtractorTest<L2<float> > test( "descriptor-surf", 0.05f, CV_DescriptorExtractorTest<L2<float> > test( "descriptor-surf", 0.05f,
DescriptorExtractor::create("SURF"), 0.147372f ); DescriptorExtractor::create("SURF") );
test.safe_run(); test.safe_run();
} }
TEST( Features2d_DescriptorExtractor_OpponentSIFT, regression ) TEST( Features2d_DescriptorExtractor_OpponentSIFT, regression )
{ {
CV_DescriptorExtractorTest<L2<float> > test( "descriptor-opponent-sift", 0.18f, CV_DescriptorExtractorTest<L2<float> > test( "descriptor-opponent-sift", 0.18f,
DescriptorExtractor::create("OpponentSIFT"), 8.06652f ); DescriptorExtractor::create("OpponentSIFT") );
test.safe_run(); test.safe_run();
} }
TEST( Features2d_DescriptorExtractor_OpponentSURF, regression ) TEST( Features2d_DescriptorExtractor_OpponentSURF, regression )
{ {
CV_DescriptorExtractorTest<L2<float> > test( "descriptor-opponent-surf", 0.3f, CV_DescriptorExtractorTest<L2<float> > test( "descriptor-opponent-surf", 0.3f,
DescriptorExtractor::create("OpponentSURF"), 0.147372f ); DescriptorExtractor::create("OpponentSURF") );
test.safe_run(); test.safe_run();
} }