[mlpack-git] master: Change spill rules's filename. (ea37f0d)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/0f4b25acd6aaa14294c044874ba6cc0751712baa...0a19d07bd39e6223991976474bc79671ba8aa0f0

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

commit ea37f0d26be3f32a63ef64f715bfc7a5840448bd
Author: MarcosPividori <marcos.pividori at gmail.com>
Date:   Mon Aug 1 02:19:21 2016 -0300

    Change spill rules's filename.


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

ea37f0d26be3f32a63ef64f715bfc7a5840448bd
 src/mlpack/methods/neighbor_search/CMakeLists.txt              |  4 ++--
 src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp   |  2 +-
 ...{neighbor_search_rules_spill.hpp => spill_search_rules.hpp} | 10 +++++-----
 ...search_rules_spill_impl.hpp => spill_search_rules_impl.hpp} | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/mlpack/methods/neighbor_search/CMakeLists.txt b/src/mlpack/methods/neighbor_search/CMakeLists.txt
index e4c76e1..0903508 100644
--- a/src/mlpack/methods/neighbor_search/CMakeLists.txt
+++ b/src/mlpack/methods/neighbor_search/CMakeLists.txt
@@ -5,8 +5,6 @@ set(SOURCES
   neighbor_search_impl.hpp
   neighbor_search_rules.hpp
   neighbor_search_rules_impl.hpp
-  neighbor_search_rules_spill.hpp
-  neighbor_search_rules_spill_impl.hpp
   neighbor_search_stat.hpp
   ns_model.hpp
   ns_model_impl.hpp
@@ -16,6 +14,8 @@ set(SOURCES
   sort_policies/furthest_neighbor_sort_impl.hpp
   spill_search.hpp
   spill_search_impl.hpp
+  spill_search_rules.hpp
+  spill_search_rules_impl.hpp
   typedef.hpp
   unmap.hpp
   unmap.cpp
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
index 8b73b2d..b16a9ea 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
@@ -211,6 +211,6 @@ class NeighborSearchRules
 #include "neighbor_search_rules_impl.hpp"
 
 // Include specialization for Spill Trees.
-#include "neighbor_search_rules_spill.hpp"
+#include "spill_search_rules.hpp"
 
 #endif // MLPACK_METHODS_NEIGHBOR_SEARCH_NEIGHBOR_SEARCH_RULES_HPP
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill.hpp b/src/mlpack/methods/neighbor_search/spill_search_rules.hpp
similarity index 96%
rename from src/mlpack/methods/neighbor_search/neighbor_search_rules_spill.hpp
rename to src/mlpack/methods/neighbor_search/spill_search_rules.hpp
index 2d76565..54b50ca 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill.hpp
+++ b/src/mlpack/methods/neighbor_search/spill_search_rules.hpp
@@ -1,13 +1,13 @@
 /**
- * @file neighbor_search_rules_spill.hpp
+ * @file spill_search_rules.hpp
  * @author Ryan Curtin
  * @author Marcos Pividori
  *
  * Defines the pruning rules and base case rules necessary to perform a
  * tree-based search with Spill Trees for the NeighborSearch class.
  */
-#ifndef MLPACK_METHODS_NEIGHBOR_SEARCH_NEIGHBOR_SEARCH_RULES_SPILL_HPP
-#define MLPACK_METHODS_NEIGHBOR_SEARCH_NEIGHBOR_SEARCH_RULES_SPILL_HPP
+#ifndef MLPACK_METHODS_NEIGHBOR_SEARCH_SPILL_SEARCH_RULES_HPP
+#define MLPACK_METHODS_NEIGHBOR_SEARCH_SPILL_SEARCH_RULES_HPP
 
 #include <mlpack/core/tree/traversal_info.hpp>
 #include <mlpack/core/tree/spill_tree.hpp>
@@ -223,6 +223,6 @@ class NeighborSearchRules<SortPolicy, MetricType, tree::SpillTree<MetricType,
 } // namespace mlpack
 
 // Include implementation.
-#include "neighbor_search_rules_spill_impl.hpp"
+#include "spill_search_rules_impl.hpp"
 
-#endif // MLPACK_METHODS_NEIGHBOR_SEARCH_NEIGHBOR_SEARCH_RULES_SPILL_HPP
+#endif // MLPACK_METHODS_NEIGHBOR_SEARCH_SPILL_SEARCH_RULES_HPP
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill_impl.hpp b/src/mlpack/methods/neighbor_search/spill_search_rules_impl.hpp
similarity index 97%
rename from src/mlpack/methods/neighbor_search/neighbor_search_rules_spill_impl.hpp
rename to src/mlpack/methods/neighbor_search/spill_search_rules_impl.hpp
index 445a414..16cdd24 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_spill_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/spill_search_rules_impl.hpp
@@ -1,15 +1,15 @@
 /**
- * @file neighbor_search_rules_spill_impl.hpp
+ * @file spill_search_rules_impl.hpp
  * @author Ryan Curtin
  * @author Marcos Pividori
  *
  * Implementation of NeighborSearchRules for Spill Trees.
  */
-#ifndef MLPACK_METHODS_NEIGHBOR_SEARCH_NEAREST_NEIGHBOR_RULES_SPILL_IMPL_HPP
-#define MLPACK_METHODS_NEIGHBOR_SEARCH_NEAREST_NEIGHBOR_RULES_SPILL_IMPL_HPP
+#ifndef MLPACK_METHODS_NEIGHBOR_SEARCH_SPILL_SEARCH_RULES_IMPL_HPP
+#define MLPACK_METHODS_NEIGHBOR_SEARCH_SPILL_SEARCH_RULES_IMPL_HPP
 
 // In case it hasn't been included yet.
-#include "neighbor_search_rules_spill.hpp"
+#include "spill_search_rules.hpp"
 
 namespace mlpack {
 namespace neighbor {
@@ -437,4 +437,4 @@ inline void NeighborSearchRules<SortPolicy, MetricType, tree::SpillTree<
 } // namespace neighbor
 } // namespace mlpack
 
-#endif // MLPACK_METHODS_NEIGHBOR_SEARCH_NEAREST_NEIGHBOR_RULES_SPILL_IMPL_HPP
+#endif // MLPACK_METHODS_NEIGHBOR_SEARCH_SPILL_SEARCH_RULES_IMPL_HPP