[mlpack-svn] r15310 - mlpack/trunk/src/mlpack/methods/rann
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Tue Jun 25 10:53:04 EDT 2013
Author: rcurtin
Date: 2013-06-25 10:53:04 -0400 (Tue, 25 Jun 2013)
New Revision: 15310
Modified:
mlpack/trunk/src/mlpack/methods/rann/ra_search_impl.hpp
Log:
Clarify comments and fix bug that occurs when no query set is specified.
Modified: mlpack/trunk/src/mlpack/methods/rann/ra_search_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/rann/ra_search_impl.hpp 2013-06-24 22:32:28 UTC (rev 15309)
+++ mlpack/trunk/src/mlpack/methods/rann/ra_search_impl.hpp 2013-06-25 14:53:04 UTC (rev 15310)
@@ -179,7 +179,8 @@
if (singleMode || naive)
{
- // Create the helper object for the tree traversal.
+ // Create the helper object for the tree traversal. Initialization of
+ // RASearchRules already implicitly performs the naive tree traversal.
typedef RASearchRules<SortPolicy, MetricType, TreeType> RuleType;
RuleType rules(referenceSet, querySet, *neighborPtr, *distancePtr,
metric, tau, alpha, naive, sampleAtLeaves, firstLeafExact,
@@ -219,13 +220,20 @@
typename TreeType::template DualTreeTraverser<RuleType> traverser(rules);
- Log::Info << "Dual-tree traversal; query statistic pre-search: "
- << queryTree->Stat().NumSamplesMade() << std::endl;
+
if (queryTree)
+ {
+ Log::Info << "Query statistic pre-search: "
+ << queryTree->Stat().NumSamplesMade() << std::endl;
traverser.Traverse(*queryTree, *referenceTree);
+ }
else
+ {
+ Log::Info << "Query statistic pre-search: " <<
+ referenceTree->Stat().NumSamplesMade() << std::endl;
traverser.Traverse(*referenceTree, *referenceTree);
+ }
numPrunes = traverser.NumPrunes();
More information about the mlpack-svn
mailing list