[mlpack-svn] r17238 - mlpack/trunk/src/mlpack/methods/kmeans

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Fri Oct 10 21:43:23 2014
New Revision: 17238

Log:
Fix distance calculations, and fix residual calculation.


Modified:
   mlpack/trunk/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp

Modified: mlpack/trunk/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp	Fri Oct 10 21:43:23 2014
@@ -70,10 +70,11 @@
   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);
 }