[mlpack-git] master: When the user requests single-tree, actually do it. (3ba7a67)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/9295469715fff6899529aed56c041de9c6ef6142...3ba7a678c125c8eb6024ec4ce7764dcb3b7faa96

>---------------------------------------------------------------

commit 3ba7a678c125c8eb6024ec4ce7764dcb3b7faa96
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Sep 17 14:35:08 2015 -0400

    When the user requests single-tree, actually do it.


>---------------------------------------------------------------

3ba7a678c125c8eb6024ec4ce7764dcb3b7faa96
 src/mlpack/methods/fastmks/fastmks_main.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/methods/fastmks/fastmks_main.cpp b/src/mlpack/methods/fastmks/fastmks_main.cpp
index 947f88a..ada3eb7 100644
--- a/src/mlpack/methods/fastmks/fastmks_main.cpp
+++ b/src/mlpack/methods/fastmks/fastmks_main.cpp
@@ -126,14 +126,21 @@ void RunFastMKS(const arma::mat& referenceData,
         FirstPointIsRoot> TreeType;
     IPMetric<KernelType> metric(kernel);
     TreeType referenceTree(referenceData, metric, base);
-    TreeType queryTree(queryData, metric, base);
 
     // Create FastMKS object.
     FastMKS<KernelType, arma::mat, StandardCoverTree> fastmks(&referenceTree,
         single);
 
     // Now search with it.
-    fastmks.Search(&queryTree, k, indices, kernels);
+    if (single)
+    {
+      fastmks.Search(queryData, k, indices, kernels);
+    }
+    else
+    {
+      TreeType queryTree(queryData, metric, base);
+      fastmks.Search(&queryTree, k, indices, kernels);
+    }
   }
 }