[mlpack-git] master: Specify metric:: namespace. (afd3f9d)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Jul 29 16:41:50 EDT 2015


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

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

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

commit afd3f9de4d9eb3993b1c75fd67f47257ef841935
Author: ryan <ryan at ratml.org>
Date:   Wed Jul 22 23:23:16 2015 -0400

    Specify metric:: namespace.


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

afd3f9de4d9eb3993b1c75fd67f47257ef841935
 src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
index f9e6e5d..1b0e474 100644
--- a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
@@ -260,9 +260,9 @@ class RectangleTree
   RectangleTree* FindByBeginCount(size_t begin, size_t count);
 
   //! Return the bound object for this node.
-  const HRectBound<EuclideanDistance>& Bound() const { return bound; }
+  const HRectBound<metric::EuclideanDistance>& Bound() const { return bound; }
   //! Modify the bound object for this node.
-  HRectBound<EuclideanDistance>& Bound() { return bound; }
+  HRectBound<metric::EuclideanDistance>& Bound() { return bound; }
 
   //! Return the statistic object for this node.
   const StatisticType& Stat() const { return stat; }
@@ -318,7 +318,7 @@ class RectangleTree
   MatType& LocalDataset() { return *localDataset; }
 
   //! Get the metric which the tree uses.
-  EuclideanDistance Metric() const { return EuclideanDistance(); }
+  metric::EuclideanDistance Metric() const { return EuclideanDistance(); }
 
   //! Get the centroid of the node and store it in the given vector.
   void Center(arma::vec& center) { bound.Center(center); }
@@ -488,7 +488,7 @@ class RectangleTree
    */
   RectangleTree(const size_t begin,
                 const size_t count,
-                HRectBound<EuclideanDistance> bound,
+                HRectBound<metric::EuclideanDistance> bound,
                 StatisticType stat,
                 const int maxLeafSize = 20) :
       begin(begin),
@@ -541,7 +541,8 @@ class RectangleTree
    *      shrinking.
    * @return true if the bound needed to be changed, false if it did not.
    */
-  bool ShrinkBoundForBound(const HRectBound<EuclideanDistance>& changedBound);
+  bool ShrinkBoundForBound(const HRectBound<metric::EuclideanDistance>&
+      changedBound);
 
   /**
    * Make an exact copy of this node, pointers and everything.



More information about the mlpack-git mailing list