[mlpack-git] master: Specify namespace. (12ca0b6)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Apr 29 14:43:47 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ee384655c4462e422e343e9725437fd772ca4449...182d4a629c1b23f683dff7b284844e4e3e9f5cc4

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

commit 12ca0b6ced67bd95fef8b712bf5303ad6e569e67
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Mar 27 17:34:12 2015 +0000

    Specify namespace.


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

12ca0b6ced67bd95fef8b712bf5303ad6e569e67
 src/mlpack/methods/mean_shift/mean_shift_impl.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/methods/mean_shift/mean_shift_impl.hpp b/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
index 4584ed0..a5ee382 100644
--- a/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
+++ b/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
@@ -74,7 +74,7 @@ bool MeanShift<KernelType, MatType>::CalcWeight(
     const arma::colvec& point,
     double& weight)
 {
-  double distance = EuclideanDistance::Evaluate(centroid, point);
+  double distance = metric::EuclideanDistance::Evaluate(centroid, point);
   if (distance >= radius || distance == 0)
     return false;
 
@@ -135,8 +135,8 @@ inline void MeanShift<KernelType, MatType>::Cluster(
       arma::Col<double> mhVector = newCentroid - allCentroids.col(i);
 
       // If the mean shift vector is small enough, it has converged.
-      if (EuclideanDistance::Evaluate(newCentroid, allCentroids.col(i)) <
-          1e-3 * radius)
+      if (metric::EuclideanDistance::Evaluate(newCentroid, allCentroids.col(i))
+          < 1e-3 * radius)
       {
         // Determine if the new centroid is duplicate with old ones.
         bool isDuplicated = false;



More information about the mlpack-git mailing list