refactored features2d and sample on matching to many images

modules/features2d/src/bagofwords.cpp

@@ -46,6 +46,12 @@ using namespace std;
 namespace cv
 {
 
+BOWTrainer::BOWTrainer()
+{}
+
+BOWTrainer::~BOWTrainer()
+{}
+
 void BOWTrainer::add( const Mat& _descriptors )
 {
     CV_Assert( !_descriptors.empty() );
@@ -63,6 +69,16 @@ void BOWTrainer::add( const Mat& _descriptors )
     descriptors.push_back(_descriptors);
 }
 
+const vector<Mat>& BOWTrainer::getDescriptors() const
+{
+    return descriptors;
+}
+
+int BOWTrainer::descripotorsCount() const
+{
+    return descriptors.empty() ? 0 : size;
+}
+
 void BOWTrainer::clear()
 {
     descriptors.clear();
@@ -91,6 +107,9 @@ Mat BOWKMeansTrainer::cluster() const
     return cluster( mergedDescriptors );
 }
 
+BOWKMeansTrainer::~BOWKMeansTrainer()
+{}
+
 Mat BOWKMeansTrainer::cluster( const Mat& descriptors ) const
 {
     Mat labels, vocabulary;
@@ -104,6 +123,9 @@ BOWImgDescriptorExtractor::BOWImgDescriptorExtractor( const Ptr<DescriptorExtrac
     dextractor(_dextractor), dmatcher(_dmatcher)
 {}
 
+BOWImgDescriptorExtractor::~BOWImgDescriptorExtractor()
+{}
+
 void BOWImgDescriptorExtractor::setVocabulary( const Mat& _vocabulary )
 {
     dmatcher->clear();
@@ -111,6 +133,11 @@ void BOWImgDescriptorExtractor::setVocabulary( const Mat& _vocabulary )
     dmatcher->add( vector<Mat>(1, vocabulary) );
 }
 
+const Mat& BOWImgDescriptorExtractor::getVocabulary() const
+{
+    return vocabulary;
+}
+
 void BOWImgDescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& keypoints, Mat& imgDescriptor,
                                          vector<vector<int> >* pointIdxsOfClusters, Mat* _descriptors )
 {
@@ -153,4 +180,14 @@ void BOWImgDescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& key
     imgDescriptor /= descriptors.rows;
 }
 
+int BOWImgDescriptorExtractor::descriptorSize() const
+{
+    return vocabulary.empty() ? 0 : vocabulary.rows;
+}
+
+int BOWImgDescriptorExtractor::descriptorType() const
+{
+    return CV_32FC1;
+}
+
 }