From 52ba2e45c4811683a32739adf8099f9003ce5ffd Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Mon, 2 Jul 2012 12:44:41 +0000 Subject: [PATCH] removed obsolete parameter 'time' in regression test for descriptors --- modules/nonfree/test/test_features2d.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/nonfree/test/test_features2d.cpp b/modules/nonfree/test/test_features2d.cpp index 8b53c0518d..34258e082d 100644 --- a/modules/nonfree/test/test_features2d.cpp +++ b/modules/nonfree/test/test_features2d.cpp @@ -291,9 +291,9 @@ public: typedef typename Distance::ValueType ValueType; typedef typename Distance::ResultType DistanceType; - CV_DescriptorExtractorTest( const string _name, DistanceType _maxDist, const Ptr& _dextractor, float _prevTime, + CV_DescriptorExtractorTest( const string _name, DistanceType _maxDist, const Ptr& _dextractor, Distance d = Distance() ): - name(_name), maxDist(_maxDist), prevTime(_prevTime), dextractor(_dextractor), distance(d) {} + name(_name), maxDist(_maxDist), dextractor(_dextractor), distance(d) {} protected: virtual void createDescriptorExtractor() {} @@ -401,7 +401,7 @@ protected: double t = (double)getTickCount(); dextractor->compute( img, keypoints, calcDescriptors ); 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() ) { @@ -486,7 +486,6 @@ protected: string name; const DistanceType maxDist; - const float prevTime; Ptr dextractor; Distance distance; @@ -988,28 +987,28 @@ TEST( Features2d_Detector_SURF, regression ) TEST( Features2d_DescriptorExtractor_SIFT, regression ) { CV_DescriptorExtractorTest > test( "descriptor-sift", 0.03f, - DescriptorExtractor::create("SIFT"), 8.06652f ); + DescriptorExtractor::create("SIFT") ); test.safe_run(); } TEST( Features2d_DescriptorExtractor_SURF, regression ) { CV_DescriptorExtractorTest > test( "descriptor-surf", 0.05f, - DescriptorExtractor::create("SURF"), 0.147372f ); + DescriptorExtractor::create("SURF") ); test.safe_run(); } TEST( Features2d_DescriptorExtractor_OpponentSIFT, regression ) { CV_DescriptorExtractorTest > test( "descriptor-opponent-sift", 0.18f, - DescriptorExtractor::create("OpponentSIFT"), 8.06652f ); + DescriptorExtractor::create("OpponentSIFT") ); test.safe_run(); } TEST( Features2d_DescriptorExtractor_OpponentSURF, regression ) { CV_DescriptorExtractorTest > test( "descriptor-opponent-surf", 0.3f, - DescriptorExtractor::create("OpponentSURF"), 0.147372f ); + DescriptorExtractor::create("OpponentSURF") ); test.safe_run(); }