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

fixed detector evaluation test

Browse Source
This commit is contained in:
Maria Dimashova 2010-10-01 09:02:54 +00:00
parent 65a0470326
commit d511e62021
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/src/evaluation.cpp
View File

@ -371,7 +371,7 @@ void cv::evaluateFeatureDetector( const Mat& img1, const Mat& img2, const Mat& H
if( keypoints1->empty() ) if( keypoints1->empty() )
fdetector->detect( img1, *keypoints1 ); fdetector->detect( img1, *keypoints1 );
if( keypoints2->empty() ) if( keypoints2->empty() )
fdetector->detect( img1, *keypoints2 ); fdetector->detect( img2, *keypoints2 );
calculateRepeatability( img1, img2, H1to2, *keypoints1, *keypoints2, repeatability, correspCount ); calculateRepeatability( img1, img2, H1to2, *keypoints1, *keypoints2, repeatability, correspCount );
} }

18
tests/cv/src/adetectordescriptor_evaluation.cpp
View File

@ -712,9 +712,11 @@ void DetectorQualityTest::runDatasetTest (const vector<Mat> &imgs, const vector<
{ {
progress = update_progress( progress, di*TEST_CASE_COUNT + ci, progressCount, 0 ); progress = update_progress( progress, di*TEST_CASE_COUNT + ci, progressCount, 0 );
vector<KeyPoint> keypoints2; vector<KeyPoint> keypoints2;
float rep;
evaluateFeatureDetector( imgs[0], imgs[ci+1], Hs[ci], &keypoints1, &keypoints2, evaluateFeatureDetector( imgs[0], imgs[ci+1], Hs[ci], &keypoints1, &keypoints2,
calcQuality[di][ci].repeatability, calcQuality[di][ci].correspondenceCount, rep, calcQuality[di][ci].correspondenceCount,
detector ); detector );
calcQuality[di][ci].repeatability = 100.f*rep;
writeKeypoints( keypontsFS, keypoints2, ci+1); writeKeypoints( keypontsFS, keypoints2, ci+1);
} }
} }
@ -748,13 +750,13 @@ int DetectorQualityTest::processResults( int datasetIdx, int caseIdx )
return res; return res;
} }
//DetectorQualityTest fastDetectorQuality = DetectorQualityTest( "FAST", "quality-detector-fast" ); DetectorQualityTest fastDetectorQuality = DetectorQualityTest( "FAST", "quality-detector-fast" );
//DetectorQualityTest gfttDetectorQuality = DetectorQualityTest( "GFTT", "quality-detector-gftt" ); DetectorQualityTest gfttDetectorQuality = DetectorQualityTest( "GFTT", "quality-detector-gftt" );
//DetectorQualityTest harrisDetectorQuality = DetectorQualityTest( "HARRIS", "quality-detector-harris" ); DetectorQualityTest harrisDetectorQuality = DetectorQualityTest( "HARRIS", "quality-detector-harris" );
//DetectorQualityTest mserDetectorQuality = DetectorQualityTest( "MSER", "quality-detector-mser" ); DetectorQualityTest mserDetectorQuality = DetectorQualityTest( "MSER", "quality-detector-mser" );
//DetectorQualityTest starDetectorQuality = DetectorQualityTest( "STAR", "quality-detector-star" ); DetectorQualityTest starDetectorQuality = DetectorQualityTest( "STAR", "quality-detector-star" );
//DetectorQualityTest siftDetectorQuality = DetectorQualityTest( "SIFT", "quality-detector-sift" ); DetectorQualityTest siftDetectorQuality = DetectorQualityTest( "SIFT", "quality-detector-sift" );
//DetectorQualityTest surfDetectorQuality = DetectorQualityTest( "SURF", "quality-detector-surf" ); DetectorQualityTest surfDetectorQuality = DetectorQualityTest( "SURF", "quality-detector-surf" );
/****************************************************************************************\ /****************************************************************************************\
* Descriptors evaluation * * Descriptors evaluation *