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

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

Author: rcurtin
Date: Wed Nov  5 14:37:18 2014
New Revision: 17300

Log:
Add DualTreeKMeans as an option to the kmeans program (and also DTNN with cover
trees).


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 Nov  5 14:37:18 2014
@@ -13,6 +13,7 @@
 #include "hamerly_kmeans.hpp"
 #include "pelleg_moore_kmeans.hpp"
 #include "dtnn_kmeans.hpp"
+#include "dual_tree_kmeans.hpp"
 
 using namespace mlpack;
 using namespace mlpack::kmeans;
@@ -154,6 +155,12 @@
   else if (algorithm == "dtnn")
     RunKMeans<InitialPartitionPolicy, EmptyClusterPolicy,
         DefaultDTNNKMeans>(ipp);
+  else if (algorithm == "dtnn-covertree")
+    RunKMeans<InitialPartitionPolicy, EmptyClusterPolicy,
+        CoverTreeDTNNKMeans>(ipp);
+  else if (algorithm == "dualtree")
+    RunKMeans<InitialPartitionPolicy, EmptyClusterPolicy,
+        DefaultDualTreeKMeans>(ipp);
   else if (algorithm == "naive")
     RunKMeans<InitialPartitionPolicy, EmptyClusterPolicy, NaiveKMeans>(ipp);
   else