[mlpack-git] master: Yet another reverse-compatibility fix for Armadillo. (af2da3c)

[gitdub at big.cc.gt.atl.ga.us]

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

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

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

commit af2da3c90cfc9efa16b3005bf3aace0a4b901140
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed Jul 30 19:25:19 2014 +0000

    Yet another reverse-compatibility fix for Armadillo.


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

af2da3c90cfc9efa16b3005bf3aace0a4b901140
 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)++;
   }