[mlpack] 251/324: Yet another reverse-compatibility fix for Armadillo.

[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 32137049660048506abb8686f824fa57aa092d0e
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Wed Jul 30 19:25:19 2014 +0000

    Yet another reverse-compatibility fix for Armadillo.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@16930 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 src/mlpack/methods/kmeans/naive_kmeans_impl.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp b/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp
index d042bac..92d26b5 100644
--- a/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp
+++ b/src/mlpack/methods/kmeans/naive_kmeans_impl.hpp
@@ -52,7 +52,7 @@ void NaiveKMeans<MetricType, MatType>::Iterate(const arma::mat& centroids,
     Log::Assert(closestCluster != centroids.n_cols);
 
     // We now have the minimum distance centroid index.  Update that centroid.
-    newCentroids.col(closestCluster) += dataset.col(i);
+    newCentroids.col(closestCluster) += arma::vec(dataset.col(i));
     counts(closestCluster)++;
   }
 

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