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

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

Author: rcurtin
Date: Wed Jun 26 13:38:20 2013
New Revision: 15342

Log:
Comment out --fast_kmeans option so it does not work at all, for now.


Modified:
   mlpack/trunk/src/mlpack/methods/kmeans/kmeans_main.cpp

Modified: mlpack/trunk/src/mlpack/methods/kmeans/kmeans_main.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/kmeans/kmeans_main.cpp	(original)
+++ mlpack/trunk/src/mlpack/methods/kmeans/kmeans_main.cpp	Wed Jun 26 13:38:20 2013
@@ -139,9 +139,9 @@
           RefinedStart(samplings, percentage));
 
       Timer::Start("clustering");
-      if (CLI::HasParam("fast_kmeans"))
-        k.FastCluster(dataset, clusters, assignments);
-      else
+//      if (CLI::HasParam("fast_kmeans"))
+//        k.FastCluster(dataset, clusters, assignments);
+//      else
         k.Cluster(dataset, clusters, assignments, centroids);
       Timer::Stop("clustering");
     }
@@ -151,9 +151,9 @@
           AllowEmptyClusters> k(maxIterations, overclustering);
 
       Timer::Start("clustering");
-      if (CLI::HasParam("fast_kmeans"))
-        k.FastCluster(dataset, clusters, assignments);
-      else
+//      if (CLI::HasParam("fast_kmeans"))
+//        k.FastCluster(dataset, clusters, assignments);
+//      else
         k.Cluster(dataset, clusters, assignments, centroids);
       Timer::Stop("clustering");
     }
@@ -177,9 +177,9 @@
           RefinedStart(samplings, percentage));
 
       Timer::Start("clustering");
-      if (CLI::HasParam("fast_kmeans"))
-        k.FastCluster(dataset, clusters, assignments);
-      else
+//      if (CLI::HasParam("fast_kmeans"))
+//        k.FastCluster(dataset, clusters, assignments);
+//      else
         k.Cluster(dataset, clusters, assignments, centroids);
       Timer::Stop("clustering");
     }
@@ -188,9 +188,9 @@
       KMeans<> k(maxIterations, overclustering);
 
       Timer::Start("clustering");
-      if (CLI::HasParam("fast_kmeans"))
-        k.FastCluster(dataset, clusters, assignments);
-      else
+//      if (CLI::HasParam("fast_kmeans"))
+//        k.FastCluster(dataset, clusters, assignments);
+//      else
         k.Cluster(dataset, clusters, assignments, centroids);
       Timer::Stop("clustering");
     }