[mlpack-git] master: Minor refactorings and fixes. (9e3550b)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/f8ceffae0613b350f4d6bdd46c6c8633a40b4897...6ee21879488fe98612a4619b17f8b51e8da5215b

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

commit 9e3550b8ca636ce1de183b6f9ea6b17f823f3db8
Author: ryan <ryan at ratml.org>
Date:   Fri Jul 24 14:27:30 2015 -0400

    Minor refactorings and fixes.


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

9e3550b8ca636ce1de183b6f9ea6b17f823f3db8
 .../core/tree/rectangle_tree/r_star_tree_split_impl.hpp    |  2 +-
 src/mlpack/core/tree/rectangle_tree/traits.hpp             | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp b/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
index 8235d8f..1a26bc0 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
@@ -64,7 +64,7 @@ void RStarTreeSplit::SplitLeafNode(TreeType* tree, std::vector<bool>& relevels)
     tree->Bound().Center(center); // Modifies centroid.
     for (size_t i = 0; i < sorted.size(); i++)
     {
-      sorted[i].d = tree->Bound().Metric().Evaluate(center,
+      sorted[i].d = tree->Metric().Evaluate(center,
           tree->LocalDataset().col(i));
       sorted[i].n = i;
     }
diff --git a/src/mlpack/core/tree/rectangle_tree/traits.hpp b/src/mlpack/core/tree/rectangle_tree/traits.hpp
index 0839c78..811d9ac 100644
--- a/src/mlpack/core/tree/rectangle_tree/traits.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/traits.hpp
@@ -18,11 +18,13 @@ namespace tree {
  * help write tree-independent (but still optimized) tree-based algorithms.  See
  * mlpack/core/tree/tree_traits.hpp for more information.
  */
-template<typename SplitType,
-         typename DescentType,
+template<typename MetricType,
          typename StatisticType,
-         typename MatType>
-class TreeTraits<RectangleTree<SplitType, DescentType, StatisticType, MatType> >
+         typename MatType,
+         typename SplitType,
+         typename DescentType>
+class TreeTraits<RectangleTree<MetricType, StatisticType, MatType, SplitType,
+                               DescentType>>
 {
  public:
   /**
@@ -53,7 +55,7 @@ class TreeTraits<RectangleTree<SplitType, DescentType, StatisticType, MatType> >
   static const bool BinaryTree = false;
 };
 
-}; // namespace tree
-}; // namespace mlpack
+} // namespace tree
+} // namespace mlpack
 
 #endif