[mlpack] 32/149: Fix distance calculations, and fix residual calculation.

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch svn-trunk
in repository mlpack.

commit c25d88a097b128380054b68a8b539e1a95c35ccb
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Sat Oct 11 01:43:23 2014 +0000

    Fix distance calculations, and fix residual calculation.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@17238 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 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);
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git