- code cleanup on matching

- fix override on linearProgramming
mwoytowich · Apr 19, 2016 · c056631 · c056631
1 parent b952cf9
commit c056631
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 36 deletions.
diff --git a/src/openMVG/linearProgramming/linearProgrammingOSI_X.hpp b/src/openMVG/linearProgramming/linearProgrammingOSI_X.hpp
@@ -41,7 +41,7 @@ public :
 
   bool solve() override ;
 
-  bool getSolution(std::vector<double> & estimatedParams);
+  bool getSolution(std::vector<double> & estimatedParams) override;
 
 private :
   SOLVERINTERFACE *si;

diff --git a/src/openMVG/matching/indMatch.hpp b/src/openMVG/matching/indMatch.hpp
@@ -77,8 +77,8 @@ typedef std::map< Pair, IndMatches > PairWiseMatches;
 static Pair_Set getPairs(const PairWiseMatches & matches)
 {
   Pair_Set pairs;
-  for(PairWiseMatches::const_iterator it = matches.begin(); it != matches.end(); ++it)
-    pairs.insert(it->first);
+  for( const auto & cur_pair : matches ) 
+    pairs.insert(cur_pair.first);
   return pairs;
 }
 

diff --git a/src/openMVG/matching/indMatchDecoratorXY.hpp b/src/openMVG/matching/indMatchDecoratorXY.hpp
@@ -64,12 +64,16 @@ class IndMatchDecorator
     const std::vector<features::SIOPointFeature> & rightFeat)
     :_vec_matches(vec_matches)
   {
-    for (size_t i = 0; i < vec_matches.size(); ++i) {
-      const size_t I = vec_matches[i]._i;
-      const size_t J = vec_matches[i]._j;
+    for ( const auto & cur_vec_match : vec_matches ) // size_t i = 0; i < vec_matches.size(); ++i) 
+    {
+      const size_t I = cur_vec_match._i ;
+      const size_t J = cur_vec_match._j ; 
+
+      // const size_t I = vec_matches[i]._i;
+      // const size_t J = vec_matches[i]._j;
       _vecDecoredMatches.push_back(
         IndMatchDecoratorStruct(leftFeat[I].x(),leftFeat[I].y(),
-        rightFeat[J].x(), rightFeat[J].y(), vec_matches[i]));
+        rightFeat[J].x(), rightFeat[J].y(), cur_vec_match ) );
     }
   }
 
@@ -78,12 +82,16 @@ class IndMatchDecorator
     const std::vector<features::PointFeature> & rightFeat)
     :_vec_matches(vec_matches)
   {
-    for (size_t i = 0; i < vec_matches.size(); ++i) {
-      const size_t I = vec_matches[i]._i;
-      const size_t J = vec_matches[i]._j;
+    for ( const auto & cur_vec_match : vec_matches ) 
+    {
+      //  size_t i = 0; i < vec_matches.size(); ++i) {
+      const size_t I = cur_vec_match._i ;
+      const size_t J = cur_vec_match._j ;      
+      // const size_t I = vec_matches[i]._i;
+      // const size_t J = vec_matches[i]._j;
       _vecDecoredMatches.push_back(
         IndMatchDecoratorStruct(leftFeat[I].x(),leftFeat[I].y(),
-        rightFeat[J].x(), rightFeat[J].y(), vec_matches[i]));
+        rightFeat[J].x(), rightFeat[J].y(), cur_vec_match ) );
     }
   }
 
@@ -92,12 +100,17 @@ class IndMatchDecorator
     const Mat & rightFeat)
     :_vec_matches(vec_matches)
   {
-    for (size_t i = 0; i < vec_matches.size(); ++i) {
-      const size_t I = vec_matches[i]._i;
-      const size_t J = vec_matches[i]._j;
+    for ( const auto & cur_vec_match : vec_matches )
+    {
+      //size_t i = 0; i < vec_matches.size(); ++i) {
+        const size_t I = cur_vec_match._i ;
+        const size_t J = cur_vec_match._j ;
+
+      // const size_t I = vec_matches[i]._i;
+      // const size_t J = vec_matches[i]._j;
       _vecDecoredMatches.push_back(
         IndMatchDecoratorStruct(leftFeat.col(I)(0),leftFeat.col(I)(1),
-        rightFeat.col(J)(0), rightFeat.col(J)(1), vec_matches[i]));
+        rightFeat.col(J)(0), rightFeat.col(J)(1), cur_vec_match ) ) ;
     }
   }
 

diff --git a/src/openMVG/matching/indMatch_utils.hpp b/src/openMVG/matching/indMatch_utils.hpp
@@ -89,12 +89,12 @@ static bool Save
     {
       return false;
     }
-    for (PairWiseMatches::const_iterator iter = matches.begin();
-      iter != matches.end(); ++iter)
+    for ( const auto & cur_match : matches ) 
     {
-      const size_t I = iter->first.first;
-      const size_t J = iter->first.second;
-      const std::vector<IndMatch> & pair_matches = iter->second;
+      const size_t I = cur_match.first.first ;
+      const size_t J = cur_match.first.second ; 
+
+      const std::vector<IndMatch> & pair_matches = cur_match.second ;
       stream << I << " " << J << '\n' << pair_matches.size() << '\n';
       copy(pair_matches.begin(), pair_matches.end(),
            std::ostream_iterator<IndMatch>(stream, "\n"));

diff --git a/src/openMVG/matching/matcher_brute_force.hpp b/src/openMVG/matching/matcher_brute_force.hpp
@@ -24,7 +24,7 @@ class ArrayMatcherBruteForce  : public ArrayMatcher<Scalar, Metric>
   public:
   typedef typename Metric::ResultType DistanceType;
 
-  ArrayMatcherBruteForce()   {}
+  ArrayMatcherBruteForce() = default ;
   virtual ~ArrayMatcherBruteForce() {
     memMapping.reset();
   }

diff --git a/src/openMVG/matching/matcher_cascade_hashing.hpp b/src/openMVG/matching/matcher_cascade_hashing.hpp
@@ -34,7 +34,7 @@ class ArrayMatcherCascadeHashing  : public ArrayMatcher<Scalar, Metric>
   public:
   typedef typename Metric::ResultType DistanceType;
 
-  ArrayMatcherCascadeHashing()   {}
+  ArrayMatcherCascadeHashing() = default ; 
   virtual ~ArrayMatcherCascadeHashing() {
     memMapping.reset();
   }

diff --git a/src/openMVG/matching/matcher_kdtree_flann.hpp b/src/openMVG/matching/matcher_kdtree_flann.hpp
@@ -27,7 +27,7 @@ class ArrayMatcher_Kdtree_Flann : public ArrayMatcher<Scalar, Metric>
   public:
   typedef typename Metric::ResultType DistanceType;
 
-  ArrayMatcher_Kdtree_Flann() {}
+  ArrayMatcher_Kdtree_Flann() = default ; 
 
   virtual ~ArrayMatcher_Kdtree_Flann()  {
     _datasetM.reset();
@@ -134,7 +134,7 @@ class ArrayMatcher_Kdtree_Flann : public ArrayMatcher<Scalar, Metric>
         {
           for (size_t j = 0; j < NN; ++j)
           {
-            if (indices[i] > 0)
+            if (indices[i] > 0) // rperrot : nullptr here ? 
             {
               pvec_indices->emplace_back(IndMatch(i, vec_indices[i*NN+j]));
               pvec_distances->emplace_back(vec_distances[i*NN+j]);

diff --git a/src/openMVG/matching/matching_filters.hpp b/src/openMVG/matching/matching_filters.hpp
@@ -197,7 +197,7 @@ static void Filter( int NN,
   // Remove multi-index
   {
     std::sort(vec_outIndex.begin(), vec_outIndex.end());
-    std::vector<IndMatch>::iterator end = std::unique(vec_outIndex.begin(), vec_outIndex.end());
+    auto end = std::unique(vec_outIndex.begin(), vec_outIndex.end());
     if(end != vec_outIndex.end()) {
       vec_outIndex.erase(end, vec_outIndex.end());
     }

diff --git a/src/openMVG/matching/matching_interface.hpp b/src/openMVG/matching/matching_interface.hpp
@@ -25,8 +25,8 @@ class ArrayMatcher
   typedef typename Metric::ResultType DistanceType;
   typedef Metric MetricT;
 
-  ArrayMatcher() {}
-  virtual ~ArrayMatcher() {};
+  ArrayMatcher() = default ; 
+  virtual ~ArrayMatcher() = default ;
 
   /**
    * Build the matching structure

diff --git a/src/openMVG/matching/pairwiseAdjacencyDisplay.hpp b/src/openMVG/matching/pairwiseAdjacencyDisplay.hpp
@@ -29,8 +29,7 @@ void PairWiseMatchingToAdjacencyMatrixSVG(const size_t NbImages,
     for (size_t I = 0; I < NbImages; ++I) {
       for (size_t J = 0; J < NbImages; ++J) {
         // If the pair have matches display a blue boxes at I,J position.
-        matching::PairWiseMatches::const_iterator iterSearch =
-          map_Matches.find(std::make_pair(I,J));
+        auto iterSearch = map_Matches.find(std::make_pair(I,J));
         if (iterSearch != map_Matches.end() && !iterSearch->second.empty())
         {
           // Display as a tooltip: (IndexI, IndexJ NbMatches)
@@ -42,7 +41,7 @@ void PairWiseMatchingToAdjacencyMatrixSVG(const size_t NbImages,
       }
     }
     // Display axes with 0 -> NbImages annotation : _|
-    std::ostringstream osNbImages;
+    std::ostringstream osNbImages;
     osNbImages << NbImages;
     svgStream.drawText((NbImages+1)*scaleFactor, scaleFactor, scaleFactor, "0", "black");
     svgStream.drawText((NbImages+1)*scaleFactor,

diff --git a/src/openMVG/matching/regions_matcher.hpp b/src/openMVG/matching/regions_matcher.hpp
@@ -35,7 +35,7 @@ void DistanceRatioMatch
 class RegionsMatcher
 {
   public:
-  ~RegionsMatcher() {}
+  ~RegionsMatcher() = default ; 
 
   /**
    * @brief Initialize the retrieval database
@@ -103,7 +103,7 @@ class RegionsMatcherT : public RegionsMatcher
   typedef typename ArrayMatcherT::ScalarT Scalar;
   typedef typename ArrayMatcherT::DistanceType DistanceType;
 
-  RegionsMatcherT() :regions_(NULL) {}
+  RegionsMatcherT() :regions_(nullptr) {}
 
   /**
    * @brief Init the matcher with some reference regions.
@@ -121,7 +121,7 @@ class RegionsMatcherT : public RegionsMatcher
   void Init_database
   (
     const features::Regions& regions
-  )
+  ) override
   {
     regions_ = &regions;
     if (regions_->RegionCount() == 0)
@@ -137,7 +137,7 @@ class RegionsMatcherT : public RegionsMatcher
   bool Match(
     const float f_dist_ratio,
     const features::Regions& queryregions_,
-    matching::IndMatches & vec_putative_matches)
+    matching::IndMatches & vec_putative_matches) override
   {
     if (regions_ == nullptr)
       return false;
@@ -165,9 +165,9 @@ class RegionsMatcherT : public RegionsMatcher
       b_squared_metric_ ? Square(f_dist_ratio) : f_dist_ratio);
 
     vec_putative_matches.reserve(vec_nn_ratio_idx.size());
-    for (size_t k=0; k < vec_nn_ratio_idx.size(); ++k)
+    for ( const auto & index : vec_nn_ratio_idx ) //  size_t k=0; k < vec_nn_ratio_idx.size(); ++k)
     {
-      const size_t index = vec_nn_ratio_idx[k];
+//      const size_t index = vec_nn_ratio_idx[k];
       vec_putative_matches.emplace_back(vec_nIndice[index*NNN__]._j, vec_nIndice[index*NNN__]._i);
     }