[mlpack-svn] r15804 - mlpack/trunk/src/mlpack/methods/range_search

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

Author: rcurtin
Date: Tue Sep 17 22:25:54 2013
New Revision: 15804

Log:
Use RangeSearchStat with cover trees.


Modified:
   mlpack/trunk/src/mlpack/methods/range_search/range_search_main.cpp

Modified: mlpack/trunk/src/mlpack/methods/range_search/range_search_main.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/range_search/range_search_main.cpp	(original)
+++ mlpack/trunk/src/mlpack/methods/range_search/range_search_main.cpp	Tue Sep 17 22:25:54 2013
@@ -66,7 +66,9 @@
     "(instead of a kd-tree).", "c");
 
 typedef RangeSearch<> RSType;
-typedef RangeSearch<metric::EuclideanDistance, CoverTree<> > RSCoverType;
+typedef CoverTree<metric::EuclideanDistance, tree::FirstPointIsRoot,
+    RangeSearchStat> CoverTreeType;
+typedef RangeSearch<metric::EuclideanDistance, CoverTreeType> RSCoverType;
 
 int main(int argc, char *argv[])
 {
@@ -136,8 +138,8 @@
     // This is significantly simpler than kd-tree construction because the data
     // matrix is not modified.
     RSCoverType* rangeSearch = NULL;
-    CoverTree<> referenceTree(referenceData);
-    CoverTree<>* queryTree = NULL;
+    CoverTreeType referenceTree(referenceData);
+    CoverTreeType* queryTree = NULL;
 
     if (CLI::GetParam<string>("query_file") == "")
     {
@@ -149,7 +151,7 @@
       // Two datasets.
       const string queryFile = CLI::GetParam<string>("query_file");
       data::Load(queryFile, queryData, true);
-      queryTree = new CoverTree<>(queryData);
+      queryTree = new CoverTreeType(queryData);
 
       rangeSearch = new RSCoverType(&referenceTree, queryTree, referenceData,
           queryData, singleMode);