From c6a943b6843f2f5307969ca33a0deadd39438cab Mon Sep 17 00:00:00 2001 From: Victor Erukhimov Date: Fri, 11 Jun 2010 19:56:52 +0000 Subject: [PATCH] DescriptorMatching -> DMatch --- .../include/opencv2/features2d/features2d.hpp | 32 +++++++++---------- modules/features2d/src/descriptors.cpp | 8 ++--- .../cv/src/adetectordescriptor_evaluation.cpp | 10 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp index 9c67b082b3..daab462db5 100644 --- a/modules/features2d/include/opencv2/features2d/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d/features2d.hpp @@ -1508,18 +1508,18 @@ struct CV_EXPORTS L2 /****************************************************************************************\ -* DescriptorMatching * +* DMatch * \****************************************************************************************/ /* * Struct for matching: match index and distance between descriptors */ -struct DescriptorMatching +struct DMatch { int index; float distance; //less is better - bool operator<( const DescriptorMatching &m) const + bool operator<( const DMatch &m) const { return distance < m.distance; } @@ -1573,7 +1573,7 @@ public: * query The query set of descriptors * matchings Matchings of the closest matches from the training set */ - void match( const Mat& query, vector& matchings ) const; + void match( const Mat& query, vector& matchings ) const; /* * Find the best matches between two descriptor sets, with constraints @@ -1587,7 +1587,7 @@ public: * matchings Matchings of the closest matches from the training set */ void match( const Mat& query, const Mat& mask, - vector& matchings ) const; + vector& matchings ) const; /* * Find the best keypoint matches for small view changes. @@ -1623,7 +1623,7 @@ protected: * The mask may be empty. */ virtual void matchImpl( const Mat& descriptors_1, const Mat& descriptors_2, - const Mat& mask, vector& matches ) const = 0; + const Mat& mask, vector& matches ) const = 0; static bool possibleMatch( const Mat& mask, int index_1, int index_2 ) { @@ -1660,14 +1660,14 @@ inline void DescriptorMatcher::match( const Mat& query, const Mat& mask, matchImpl( query, train, mask, matches ); } -inline void DescriptorMatcher::match( const Mat& query, vector& matches ) const +inline void DescriptorMatcher::match( const Mat& query, vector& matches ) const { matchImpl( query, train, Mat(), matches ); } inline void DescriptorMatcher::match( const Mat& query, const Mat& mask, - vector& matches ) const + vector& matches ) const { matchImpl( query, train, mask, matches ); } @@ -1697,7 +1697,7 @@ protected: const Mat& mask, vector& matches ) const; virtual void matchImpl( const Mat& descriptors_1, const Mat& descriptors_2, - const Mat& mask, vector& matches ) const; + const Mat& mask, vector& matches ) const; Distance distance; }; @@ -1706,7 +1706,7 @@ template void BruteForceMatcher::matchImpl( const Mat& descriptors_1, const Mat& descriptors_2, const Mat& mask, vector& matches ) const { - vector matchings; + vector matchings; matchImpl( descriptors_1, descriptors_2, mask, matchings); matches.resize( matchings.size() ); for( size_t i=0;i::matchImpl( const Mat& descriptors_1, const Mat template void BruteForceMatcher::matchImpl( const Mat& descriptors_1, const Mat& descriptors_2, - const Mat& mask, vector& matches ) const + const Mat& mask, vector& matches ) const { typedef typename Distance::ValueType ValueType; typedef typename Distance::ResultType DistanceType; @@ -1753,7 +1753,7 @@ void BruteForceMatcher::matchImpl( const Mat& descriptors_1, const Mat if( matchIndex != -1 ) { - DescriptorMatching matching; + DMatch matching; matching.index = matchIndex; matching.distance = matchDistance; matches[i] = matching; @@ -1830,7 +1830,7 @@ public: // image The source image // points Test keypoints from the source image // matchings A vector to be filled with keypoint matchings - virtual void match( const Mat& image, vector& points, vector& matchings ) {}; + virtual void match( const Mat& image, vector& points, vector& matchings ) {}; // Clears keypoints storing in collection virtual void clear(); @@ -1906,7 +1906,7 @@ public: // loaded with DescriptorOneWay::Initialize, kd tree is used for finding minimum distances. virtual void match( const Mat& image, vector& points, vector& indices ); - virtual void match( const Mat& image, vector& points, vector& matchings ); + virtual void match( const Mat& image, vector& points, vector& matchings ); // Classify a set of keypoints. The same as match, but returns point classes rather than indices virtual void classify( const Mat& image, vector& points ); @@ -2036,7 +2036,7 @@ public: virtual void match( const Mat& image, vector& keypoints, vector& indices ); - virtual void match( const Mat& image, vector& points, vector& matchings ); + virtual void match( const Mat& image, vector& points, vector& matchings ); virtual void classify( const Mat& image, vector& keypoints ); @@ -2094,7 +2094,7 @@ public: matcher.match( descriptors, keypointIndices ); }; - virtual void match( const Mat& image, vector& points, vector& matchings ) + virtual void match( const Mat& image, vector& points, vector& matchings ) { Mat descriptors; extractor.compute( image, points, descriptors ); diff --git a/modules/features2d/src/descriptors.cpp b/modules/features2d/src/descriptors.cpp index 88aeb06cae..35e0e282ab 100644 --- a/modules/features2d/src/descriptors.cpp +++ b/modules/features2d/src/descriptors.cpp @@ -433,7 +433,7 @@ void OneWayDescriptorMatch::add( KeyPointCollection& keypoints ) void OneWayDescriptorMatch::match( const Mat& image, vector& points, vector& indices) { - vector matchings( points.size() ); + vector matchings( points.size() ); indices.resize(points.size()); match( image, points, matchings ); @@ -442,7 +442,7 @@ void OneWayDescriptorMatch::match( const Mat& image, vector& points, v indices[i] = matchings[i].index; } -void OneWayDescriptorMatch::match( const Mat& image, vector& points, vector& matchings ) +void OneWayDescriptorMatch::match( const Mat& image, vector& points, vector& matchings ) { matchings.resize( points.size() ); IplImage _image = image; @@ -450,7 +450,7 @@ void OneWayDescriptorMatch::match( const Mat& image, vector& points, v { int poseIdx = -1; - DescriptorMatching matching; + DMatch matching; matching.index = -1; base->FindDescriptor( &_image, points[i].pt, matching.index, poseIdx, matching.distance ); matchings[i] = matching; @@ -744,7 +744,7 @@ void FernDescriptorMatch::match( const Mat& image, vector& keypoints, } } -void FernDescriptorMatch::match( const Mat& image, vector& keypoints, vector& matchings ) +void FernDescriptorMatch::match( const Mat& image, vector& keypoints, vector& matchings ) { trainFernClassifier(); diff --git a/tests/cv/src/adetectordescriptor_evaluation.cpp b/tests/cv/src/adetectordescriptor_evaluation.cpp index c198b1bec2..b0e3cbd0a3 100644 --- a/tests/cv/src/adetectordescriptor_evaluation.cpp +++ b/tests/cv/src/adetectordescriptor_evaluation.cpp @@ -425,7 +425,7 @@ inline float precision( int correctMatchCount, int falseMatchCount ) } void evaluateDescriptors( const vector& keypoints1, const vector& keypoints2, - vector< pair >& matches1to2, + vector< pair >& matches1to2, const Mat& img1, const Mat& img2, const Mat& H1to2, int &correctMatchCount, int &falseMatchCount, vector &matchStatuses, int& correspondenceCount ) { @@ -1385,7 +1385,7 @@ void DescriptorQualityTest::runDatasetTest (const vector &imgs, const vecto transformToEllipticKeyPoints( keypoints1, ekeypoints1 ); int progressCount = DATASETS_COUNT*TEST_CASE_COUNT; - vector< pair > allMatchings; + vector< pair > allMatchings; vector allMatchStatuses; size_t matchingIndex = 0; int allCorrespCount = 0; @@ -1405,11 +1405,11 @@ void DescriptorQualityTest::runDatasetTest (const vector &imgs, const vecto readKeypoints( keypontsFS, keypoints2, ci+1 ); transformToEllipticKeyPoints( keypoints2, ekeypoints2 ); descMatch->add( imgs[ci+1], keypoints2 ); - vector matchings1to2; + vector matchings1to2; descMatch->match( imgs[0], keypoints1, matchings1to2 ); - vector< pair > matchings (matchings1to2.size()); + vector< pair > matchings (matchings1to2.size()); for( size_t i=0;i( matchings1to2[i], i); + matchings[i] = pair( matchings1to2[i], i); // TODO if( commRunParams[di].matchFilter ) int correspCount;