fixed fail of descriptor-sift test (ticket 567)

diff --git a/tests/cv/src/afeatures2d.cpp b/tests/cv/src/afeatures2d.cpp
index d570a87b7f3c86c6842ab4c051b41b729f484a3a..f1d28969a5516eb5555cbc092c225340865184b1 100644 (file)
--- a/tests/cv/src/afeatures2d.cpp
+++ b/tests/cv/src/afeatures2d.cpp
@@ -166,13 +166,13 @@ protected:
     Ptr<FeatureDetector> fdetector;
 };
 
-CV_FeatureDetectorTest fastTest( "detector_fast", createFeatureDetector("FAST") );
-CV_FeatureDetectorTest gfttTest( "detector_gftt", createFeatureDetector("GFTT") );
-CV_FeatureDetectorTest harrisTest( "detector_harris", createFeatureDetector("HARRIS") );
-CV_FeatureDetectorTest mserTest( "detector_mser", createFeatureDetector("MSER") );
-CV_FeatureDetectorTest siftTest( "detector_sift", createFeatureDetector("SIFT") );
-CV_FeatureDetectorTest starTest( "detector_star", createFeatureDetector("STAR") );
-CV_FeatureDetectorTest surfTest( "detector_surf", createFeatureDetector("SURF") );
+CV_FeatureDetectorTest fastTest( "detector-fast", createFeatureDetector("FAST") );
+CV_FeatureDetectorTest gfttTest( "detector-gftt", createFeatureDetector("GFTT") );
+CV_FeatureDetectorTest harrisTest( "detector-harris", createFeatureDetector("HARRIS") );
+CV_FeatureDetectorTest mserTest( "detector-mser", createFeatureDetector("MSER") );
+CV_FeatureDetectorTest siftTest( "detector-sift", createFeatureDetector("SIFT") );
+CV_FeatureDetectorTest starTest( "detector-star", createFeatureDetector("STAR") );
+CV_FeatureDetectorTest surfTest( "detector-surf", createFeatureDetector("SURF") );
 
 /****************************************************************************************\
 *                     Regression tests for descriptor extractors.                        *
@@ -215,8 +215,8 @@ static Mat readMatFromBin( const string& filename )
 class CV_DescriptorExtractorTest : public CvTest
 {
 public:
-    CV_DescriptorExtractorTest( const char* testName, float _normDif, const Ptr<DescriptorExtractor>& _dextractor, float _prevTime  ) :
-            CvTest( testName, "cv::DescriptorExtractor::compute" ), normDif(_normDif), prevTime(_prevTime), dextractor(_dextractor) {}
+    CV_DescriptorExtractorTest( const char* testName, float _maxNormDif, const Ptr<DescriptorExtractor>& _dextractor, float _prevTime  ) :
+            CvTest( testName, "cv::DescriptorExtractor::compute" ), maxNormDif(_maxNormDif), prevTime(_prevTime), dextractor(_dextractor) {}
 protected:
     virtual void createDescriptorExtractor() {}
 
@@ -272,9 +272,9 @@ protected:
         Mat validDescriptors = readDescriptors();
         if( !validDescriptors.empty() )
         {
-            double normVal = norm( calcDescriptors, validDescriptors, NORM_INF );
-            ts->printf( CvTS::LOG, "nofm (inf) BTW valid and calculated float descriptors = %f\n", normVal );
-            if( normVal > normDif )
+            double normValue = norm( calcDescriptors, validDescriptors, NORM_INF );
+            ts->printf( CvTS::LOG, "nofm (inf) BTW valid and calculated float descriptors = %f\n", normValue );
+            if( normValue > maxNormDif )
                 ts->set_failed_test_info( CvTS::FAIL_BAD_ACCURACY );
         }
         else
@@ -300,7 +300,7 @@ protected:
         return true;
     }
 
-    const float normDif;
+    const float maxNormDif;
     const float prevTime;
 
     Ptr<DescriptorExtractor> dextractor;
@@ -320,20 +320,20 @@ public:
     }
 };
 
-CV_DescriptorExtractorTest siftDescriptorTest( "descriptor_sift", 0.001f,
+CV_DescriptorExtractorTest siftDescriptorTest( "descriptor-sift", 0.008f,
                                                 createDescriptorExtractor("SIFT"), 8.06652f  );
-CV_DescriptorExtractorTest surfDescriptorTest( "descriptor_surf",  0.004f,
+CV_DescriptorExtractorTest surfDescriptorTest( "descriptor-surf",  0.004f,
                                                 createDescriptorExtractor("SURF"), 0.147372f );
-//CV_DescriptorExtractorTest siftDescriptorTest( "descriptor_opponent_sift", 0.001f,
+//CV_DescriptorExtractorTest siftDescriptorTest( "descriptor-opponent_sift", 0.001f,
 //                                                createDescriptorExtractor("OpponentSIFT"), 8.06652f  );
-//CV_DescriptorExtractorTest surfDescriptorTest( "descriptor_opponent_surf",  0.004f,
+//CV_DescriptorExtractorTest surfDescriptorTest( "descriptor-opponent_surf",  0.004f,
 //                                                createDescriptorExtractor("OpponentSURF"), 0.147372f );
 
 #if CV_SSE2
-CV_CalonderDescriptorExtractorTest<uchar> ucharCalonderTest( "descriptor_calonder_uchar",
+CV_CalonderDescriptorExtractorTest<uchar> ucharCalonderTest( "descriptor-calonder-uchar",
                                                              std::numeric_limits<float>::epsilon() + 1,
                                                              0.0132175f );
-CV_CalonderDescriptorExtractorTest<float> floatCalonderTest( "descriptor_calonder_float",
+CV_CalonderDescriptorExtractorTest<float> floatCalonderTest( "descriptor-calonder-float",
                                                              std::numeric_limits<float>::epsilon(),
                                                              0.0221308f );
 #endif // CV_SSE2

diff --git a/tests/cv/src/tsysa.cpp b/tests/cv/src/tsysa.cpp
index 617b7c27a37310a85609552e6af7adaf9e8243da..d53c9461f09119453deb9cd590bf7300a6c24621 100644 (file)
--- a/tests/cv/src/tsysa.cpp
+++ b/tests/cv/src/tsysa.cpp
@@ -55,9 +55,9 @@ const char* blacklist[] =
     "chessboard-subpixel",         //ticket 473
     //"color-luv",                   //ticket 502
     
-    "descriptor_sift",             //ticket 567
-    "descriptor_surf",             //ticket 568
-    "detector_surf",               //ticket 578
+    //"descriptor-sift",             //ticket 567
+    "descriptor-surf",             //ticket 568
+    "detector-surf",               //ticket 578
     
     "filter-generic",
     "flann_saved",                 //ticket 618