[mlpack-git] master: Improve name of Search visitors. (a0bcee9)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/a7e8d3bac60d6aa2717f27e0d4f6c53ff20607f5...779556fed748819a18cc898d9a6f69900740ef23

>---------------------------------------------------------------

commit a0bcee91b243d7f0518032ddd51de34b3b92cea9
Author: MarcosPividori <marcos.pividori at gmail.com>
Date:   Mon Jun 13 17:55:29 2016 -0300

    Improve name of Search visitors.


>---------------------------------------------------------------

a0bcee91b243d7f0518032ddd51de34b3b92cea9
 src/mlpack/methods/neighbor_search/ns_model.hpp    | 20 +++++++--------
 .../methods/neighbor_search/ns_model_impl.hpp      | 30 +++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/mlpack/methods/neighbor_search/ns_model.hpp b/src/mlpack/methods/neighbor_search/ns_model.hpp
index 458bf97..f269e13 100644
--- a/src/mlpack/methods/neighbor_search/ns_model.hpp
+++ b/src/mlpack/methods/neighbor_search/ns_model.hpp
@@ -49,7 +49,7 @@ struct NSModelName<FurthestNeighborSort>
   static const std::string Name() { return "furthest_neighbor_search_model"; }
 };
 
-class SearchKVisitor : public boost::static_visitor<void>
+class MonoSearchVisitor : public boost::static_visitor<void>
 {
  private:
    const size_t k;
@@ -60,12 +60,12 @@ class SearchKVisitor : public boost::static_visitor<void>
    template<typename NSType>
    void operator()(NSType *ns) const;
 
-   SearchKVisitor(const size_t k,
-                  arma::Mat<size_t>& neighbors,
-                  arma::mat& distances);
+   MonoSearchVisitor(const size_t k,
+                     arma::Mat<size_t>& neighbors,
+                     arma::mat& distances);
 };
 
-class SearchVisitor : public boost::static_visitor<void>
+class BiSearchVisitor : public boost::static_visitor<void>
 {
  private:
    const arma::mat& querySet;
@@ -90,11 +90,11 @@ class SearchVisitor : public boost::static_visitor<void>
    template<typename SortPolicy>
    void operator()(NSType<SortPolicy,tree::BallTree> *ns) const;
 
-   SearchVisitor(const arma::mat& querySet,
-                 const size_t k,
-                 arma::Mat<size_t>& neighbors,
-                 arma::mat& distances,
-                 const size_t leafSize);
+   BiSearchVisitor(const arma::mat& querySet,
+                   const size_t k,
+                   arma::Mat<size_t>& neighbors,
+                   arma::mat& distances,
+                   const size_t leafSize);
 };
 
 class TrainVisitor : public boost::static_visitor<void>
diff --git a/src/mlpack/methods/neighbor_search/ns_model_impl.hpp b/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
index ea2206e..ef67d18 100644
--- a/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
@@ -16,16 +16,16 @@
 namespace mlpack {
 namespace neighbor {
 
-SearchKVisitor::SearchKVisitor(const size_t k,
-                               arma::Mat<size_t>& neighbors,
-                               arma::mat& distances) :
+MonoSearchVisitor::MonoSearchVisitor(const size_t k,
+                                     arma::Mat<size_t>& neighbors,
+                                     arma::mat& distances) :
     k(k),
     neighbors(neighbors),
     distances(distances)
 {}
 
 template<typename NSType>
-void SearchKVisitor::operator()(NSType *ns) const
+void MonoSearchVisitor::operator()(NSType *ns) const
 {
   if (ns)
     return ns->Search(k, neighbors, distances);
@@ -33,11 +33,11 @@ void SearchKVisitor::operator()(NSType *ns) const
 }
 
 
-SearchVisitor::SearchVisitor(const arma::mat& querySet,
-                             const size_t k,
-                             arma::Mat<size_t>& neighbors,
-                             arma::mat& distances,
-                             const size_t leafSize) :
+BiSearchVisitor::BiSearchVisitor(const arma::mat& querySet,
+                                 const size_t k,
+                                 arma::Mat<size_t>& neighbors,
+                                 arma::mat& distances,
+                                 const size_t leafSize) :
     querySet(querySet),
     k(k),
     neighbors(neighbors),
@@ -49,7 +49,7 @@ template<typename SortPolicy,
          template<typename TreeMetricType,
                   typename TreeStatType,
                   typename TreeMatType> class TreeType>
-void SearchVisitor::operator()(NSType<SortPolicy,TreeType> *ns) const
+void BiSearchVisitor::operator()(NSType<SortPolicy,TreeType> *ns) const
 {
   if (ns)
     return ns->Search(querySet, k, neighbors, distances);
@@ -57,7 +57,7 @@ void SearchVisitor::operator()(NSType<SortPolicy,TreeType> *ns) const
 }
 
 template<typename SortPolicy>
-void SearchVisitor::operator()(NSType<SortPolicy,tree::KDTree> *ns) const
+void BiSearchVisitor::operator()(NSType<SortPolicy,tree::KDTree> *ns) const
 {
   if (ns)
     return SearchLeaf(ns);
@@ -65,7 +65,7 @@ void SearchVisitor::operator()(NSType<SortPolicy,tree::KDTree> *ns) const
 }
 
 template<typename SortPolicy>
-void SearchVisitor::operator()(NSType<SortPolicy,tree::BallTree> *ns) const
+void BiSearchVisitor::operator()(NSType<SortPolicy,tree::BallTree> *ns) const
 {
   if (ns)
     return SearchLeaf(ns);
@@ -73,7 +73,7 @@ void SearchVisitor::operator()(NSType<SortPolicy,tree::BallTree> *ns) const
 }
 
 template<typename NSType>
-void SearchVisitor::SearchLeaf(NSType *ns) const
+void BiSearchVisitor::SearchLeaf(NSType *ns) const
 {
   if (!ns->Naive() && !ns->SingleMode())
   {
@@ -374,7 +374,7 @@ void NSModel<SortPolicy>::Search(arma::mat&& querySet,
   else
     Log::Info << "brute-force (naive) search..." << std::endl;
 
-  SearchVisitor search(querySet, k, neighbors, distances, leafSize);
+  BiSearchVisitor search(querySet, k, neighbors, distances, leafSize);
   boost::apply_visitor(search, nSearch);
 }
 
@@ -392,7 +392,7 @@ void NSModel<SortPolicy>::Search(const size_t k,
   else
     Log::Info << "brute-force (naive) search..." << std::endl;
 
-  SearchKVisitor search(k, neighbors, distances);
+  MonoSearchVisitor search(k, neighbors, distances);
   boost::apply_visitor(search, nSearch);
 }