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

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Sep 16 23:02:43 EDT 2013


Author: rcurtin
Date: Mon Sep 16 23:02:43 2013
New Revision: 15792

Log:
Use RangeSearchStat (although nothing is being done with it yet).


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

Modified: mlpack/trunk/src/mlpack/methods/range_search/range_search.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/range_search/range_search.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/range_search/range_search.hpp	Mon Sep 16 23:02:43 2013
@@ -14,6 +14,8 @@
 
 #include <mlpack/core/tree/binary_space_tree.hpp>
 
+#include "range_search_stat.hpp"
+
 namespace mlpack {
 namespace range /** Range-search routines. */ {
 
@@ -25,7 +27,7 @@
  */
 template<typename MetricType = mlpack::metric::EuclideanDistance,
          typename TreeType = tree::BinarySpaceTree<bound::HRectBound<2>,
-                                                   tree::EmptyStatistic> >
+                                                   RangeSearchStat> >
 class RangeSearch
 {
  public:

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	Mon Sep 16 23:02:43 2013
@@ -177,9 +177,9 @@
     Log::Info << "Building reference tree..." << endl;
     Timer::Start("tree_building");
 
-    BinarySpaceTree<bound::HRectBound<2>, tree::EmptyStatistic>
+    BinarySpaceTree<bound::HRectBound<2>, tree::RangeSearchStat>
         refTree(referenceData, oldFromNewRefs, leafSize);
-    BinarySpaceTree<bound::HRectBound<2>, tree::EmptyStatistic>*
+    BinarySpaceTree<bound::HRectBound<2>, tree::RangeSearchStat>*
         queryTree = NULL; // Empty for now.
 
     Timer::Stop("tree_building");
@@ -203,7 +203,7 @@
       Timer::Start("tree_building");
 
       queryTree = new BinarySpaceTree<bound::HRectBound<2>,
-          tree::EmptyStatistic >(queryData, oldFromNewQueries,
+          tree::RangeSearchStat>(queryData, oldFromNewQueries,
           leafSize);
 
       Timer::Stop("tree_building");



More information about the mlpack-svn mailing list