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

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

Author: rcurtin
Date: Wed Jul 30 14:50:20 2014
New Revision: 16929

Log:
Explicit cast to arma::vec for old versions of Armadillo.


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

Modified: mlpack/trunk/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp	Wed Jul 30 14:50:20 2014
@@ -38,7 +38,7 @@
     size_t closestCluster = centroids.n_cols; // Invalid value.
 
     for (size_t j = 0; j < centroids.n_cols; j++)
-    { 
+    {
       const double distance = metric.Evaluate(data.col(i), centroids.col(j));
 
       if (distance < minDistance)
@@ -87,7 +87,7 @@
   centroids.col(maxVarCluster) *= (double(clusterCounts[maxVarCluster]) /
       double(clusterCounts[maxVarCluster] - 1));
   centroids.col(maxVarCluster) -= (1.0 / (clusterCounts[maxVarCluster] - 1.0)) *
-      data.col(furthestPoint);
+      arma::vec(data.col(furthestPoint));
   clusterCounts[maxVarCluster]--;
   clusterCounts[emptyCluster]++;
   centroids.col(emptyCluster) = arma::vec(data.col(furthestPoint));