[mlpack-svn] r15793 - mlpack/trunk/src/mlpack/tests

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

Author: rcurtin
Date: Mon Sep 16 23:02:57 2013
New Revision: 15793

Log:
Use RangeSearchStat in cover tree objects.


Modified:
   mlpack/trunk/src/mlpack/tests/range_search_test.cpp

Modified: mlpack/trunk/src/mlpack/tests/range_search_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/range_search_test.cpp	(original)
+++ mlpack/trunk/src/mlpack/tests/range_search_test.cpp	Mon Sep 16 23:02:57 2013
@@ -579,9 +579,11 @@
   // Set up kd-tree range search.
   RangeSearch<> kdsearch(data);
   // Set up cover tree range search.
-  tree::CoverTree<> tree(data);
-  RangeSearch<metric::EuclideanDistance, tree::CoverTree<> >
-      coversearch(&tree, data);
+  typedef tree::CoverTree<metric::EuclideanDistance, tree::FirstPointIsRoot,
+      RangeSearchStat> CoverTreeType;
+  CoverTreeType tree(data);
+  RangeSearch<metric::EuclideanDistance, CoverTreeType> coversearch(&tree,
+      data);
 
   // Four trials with different ranges.
   for (size_t r = 0; r < 4; ++r)
@@ -652,9 +654,11 @@
   // Set up kd-tree range search.
   RangeSearch<> kdsearch(data, queries);
   // Set up cover tree range search.
-  tree::CoverTree<> tree(data);
-  tree::CoverTree<> queryTree(queries);
-  RangeSearch<metric::EuclideanDistance, tree::CoverTree<> >
+  typedef tree::CoverTree<metric::EuclideanDistance, tree::FirstPointIsRoot,
+      RangeSearchStat> CoverTreeType;
+  CoverTreeType tree(data);
+  CoverTreeType queryTree(queries);
+  RangeSearch<metric::EuclideanDistance, CoverTreeType>
       coversearch(&tree, &queryTree, data, queries);
 
   // Four trials with different ranges.
@@ -725,8 +729,10 @@
   // Set up kd-tree range search.
   RangeSearch<> kdsearch(data, true);
   // Set up cover tree range search.
-  tree::CoverTree<> tree(data);
-  RangeSearch<metric::EuclideanDistance, tree::CoverTree<> >
+  typedef tree::CoverTree<metric::EuclideanDistance, tree::FirstPointIsRoot,
+      RangeSearchStat> CoverTreeType;
+  CoverTreeType tree(data);
+  RangeSearch<metric::EuclideanDistance, CoverTreeType>
       coversearch(&tree, data, true);
 
   // Four trials with different ranges.