[mlpack-git] master, mlpack-1.0.x: commit to ease debugging (dc22914)

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

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

On branches: master,mlpack-1.0.x
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

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

commit dc2291452855913c6c1a2eb471d62cafd94a306a
Author: andrewmw94 <andrewmw94 at gmail.com>
Date:   Wed Jul 2 18:36:35 2014 +0000

    commit to ease debugging


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

dc2291452855913c6c1a2eb471d62cafd94a306a
 src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp | 6 +++++-
 src/mlpack/methods/neighbor_search/allknn_main.cpp                 | 7 -------
 src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp        | 7 ++++++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp b/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp
index f6adc20..ef4e071 100644
--- a/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp
@@ -26,7 +26,9 @@ RectangleTree<SplitType, DescentType, StatisticType, MatType>::
 SingleTreeTraverser<RuleType>::SingleTreeTraverser(RuleType& rule) :
     rule(rule),
     numPrunes(0)
-{ /* Nothing to do */ }
+{ 
+  std::cout << "constructing traverser" << std::endl;
+  /* Nothing to do */ }
 
 template<typename SplitType,
          typename DescentType,
@@ -39,6 +41,8 @@ SingleTreeTraverser<RuleType>::Traverse(
     const RectangleTree<SplitType, DescentType, StatisticType, MatType>&
         referenceNode)
 {
+  std::cout << "traversing" << std::endl;
+  
   // If we reach a leaf node, we need to run the base case.
   if(referenceNode.IsLeaf()) {
     for(size_t i = 0; i < referenceNode.Count(); i++) {
diff --git a/src/mlpack/methods/neighbor_search/allknn_main.cpp b/src/mlpack/methods/neighbor_search/allknn_main.cpp
index b4dc0cf..f55ccbc 100644
--- a/src/mlpack/methods/neighbor_search/allknn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/allknn_main.cpp
@@ -328,13 +328,6 @@ int main(int argc, char *argv[])
 
 
       delete allknn;
-            
-      
-      // Build the reference tree.
-      Log::Info << "Building reference tree..." << endl;
-      Timer::Start("tree_building");
-
-      Timer::Stop("tree_building");
     }
   }
   else // Cover trees.
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
index bcada1f..1ff8a2e 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
@@ -252,6 +252,8 @@ void NeighborSearch<SortPolicy, MetricType, TreeType>::Search(
   }
   else if (singleMode)
   {
+    
+    std::cout << " we are in NeighborSearchImpl" << std::endl;
     // The search doesn't work if the root node is also a leaf node.
     // if this is the case, it is suggested that you use the naive method.
     assert(!(referenceTree->IsLeaf()));
@@ -259,11 +261,14 @@ void NeighborSearch<SortPolicy, MetricType, TreeType>::Search(
     // Create the traverser.
     typename TreeType::template SingleTreeTraverser<RuleType> traverser(rules);
     
+        std::cout << " n_cols = " << querySet.n_cols << std::endl;
+
+    
     // Now have it traverse for each point.
     for (size_t i = 0; i < querySet.n_cols; ++i)
       traverser.Traverse(i, *referenceTree);
   }
-  else // Dual-tree recursion.
+  else // Dual-tree recursion.referenceTree
   {
     // Create the traverser.
     typename TreeType::template DualTreeTraverser<RuleType> traverser(rules);