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

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

Author: rcurtin
Date: 2012-04-12 12:12:46 -0400 (Thu, 12 Apr 2012)
New Revision: 12344

Modified:
   mlpack/trunk/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp
Log:
Fix ambiguity error under Armadillo 3.0.0.


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	2012-04-12 15:54:30 UTC (rev 12343)
+++ mlpack/trunk/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp	2012-04-12 16:12:46 UTC (rev 12344)
@@ -32,7 +32,7 @@
   // this is the sensible thing to do.
   for (size_t i = 0; i < data.n_cols; i++)
   {
-    variances[assignments[i]] += as_scalar(
+    variances[assignments[i]] += arma::as_scalar(
         var(data.col(i) - centroids.col(assignments[i])));
   }
 
@@ -47,7 +47,7 @@
   {
     if (assignments[i] == maxVarCluster)
     {
-      double distance = as_scalar(
+      double distance = arma::as_scalar(
           var(data.col(i) - centroids.col(maxVarCluster)));
 
       if (distance > maxDistance)