[mlpack-svn] r14967 - mlpack/trunk/src/mlpack/methods/fastmks

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

Author: rcurtin
Date: 2013-04-26 23:11:07 -0400 (Fri, 26 Apr 2013)
New Revision: 14967

Modified:
   mlpack/trunk/src/mlpack/methods/fastmks/fastmks_main.cpp
Log:
Remove base option -- just for now -- and update calls to FastMKS constructor
for new API.


Modified: mlpack/trunk/src/mlpack/methods/fastmks/fastmks_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/fastmks/fastmks_main.cpp	2013-04-27 03:10:47 UTC (rev 14966)
+++ mlpack/trunk/src/mlpack/methods/fastmks/fastmks_main.cpp	2013-04-27 03:11:07 UTC (rev 14967)
@@ -50,7 +50,7 @@
 PARAM_FLAG("single", "If true, single-tree search is used (as opposed to "
     "dual-tree search.", "s");
 
-PARAM_DOUBLE("base", "Base to use during cover tree construction.", "b", 2.0);
+//PARAM_DOUBLE("base", "Base to use during cover tree construction.", "b", 2.0);
 
 PARAM_DOUBLE("degree", "Degree of polynomial kernel.", "d", 2.0);
 PARAM_DOUBLE("offset", "Offset of kernel (for polynomial and hyptan kernels).",
@@ -61,17 +61,16 @@
 
 template<typename KernelType>
 void RunFastMKS(const arma::mat& referenceData,
-              const bool single,
-              const bool naive,
-              const double base,
-              const size_t k,
-              arma::Mat<size_t>& indices,
-              arma::mat& products,
-              KernelType& kernel)
+                const bool single,
+                const bool naive,
+                const double base,
+                const size_t k,
+                arma::Mat<size_t>& indices,
+                arma::mat& products,
+                KernelType& kernel)
 {
   // Create FastMKS object.
-  FastMKS<KernelType> fastmks(referenceData, kernel, (single && !naive), naive,
-      base);
+  FastMKS<KernelType> fastmks(referenceData, kernel, (single && !naive), naive);
 
   // Now search with it.
   fastmks.Search(k, indices, products);
@@ -90,7 +89,7 @@
 {
   // Create FastMKS object.
   FastMKS<KernelType> maxip(referenceData, queryData, kernel,
-      (single && !naive), naive, base);
+      (single && !naive), naive);
 
   // Now search with it.
   maxip.Search(k, indices, products);