[mlpack-git] master: Fix distance calculations, and fix residual calculation. (508df11)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:01:06 EST 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

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

commit 508df11656c9d3f1aeacc6d785904ff561fd458b
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sat Oct 11 01:43:23 2014 +0000

    Fix distance calculations, and fix residual calculation.


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

508df11656c9d3f1aeacc6d785904ff561fd458b
 src/mlpack/methods/kmeans/naive_kmeans_impl.hpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp b/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp
index 316232b..0fe4e18 100644
--- a/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp
+++ b/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp
@@ -70,10 +70,11 @@ double NaiveKMeans<MetricType, MatType>::Iterate(const arma::mat& centroids,
   double cNorm = 0.0;
   for (size_t i = 0; i < centroids.n_cols; ++i)
   {
-    const double dist = std::pow(
-        metric.Evaluate(centroids.col(i), newCentroids.col(i)), 2.0);
-    cNorm += std::pow(dist, 2.0);
+    cNorm += std::pow(metric.Evaluate(centroids.col(i), newCentroids.col(i)),
+        2.0);
   }
+  distanceCalculations += centroids.n_cols;
+
   return std::sqrt(cNorm);
 }
 



More information about the mlpack-git mailing list