[mlpack-svn] r16739 - in mlpack/trunk/src/mlpack: core/tree/rectangle_tree methods/neighbor_search

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

Author: andrewmw94
Date: Wed Jul  2 14:36:35 2014
New Revision: 16739

Log:
commit to ease debugging

Modified:
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp
   mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp
   mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp	Wed Jul  2 14:36:35 2014
@@ -26,7 +26,9 @@
 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 @@
     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++) {

Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp	(original)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp	Wed Jul  2 14:36:35 2014
@@ -295,7 +295,7 @@
       queryTree = NULL; // Empty for now.
 
       Timer::Stop("tree_building");
-
+      
       if (CLI::GetParam<string>("query_file") != "")
       {
 	Log::Info << "Loaded query data from '" << queryFile << "' ("
@@ -328,13 +328,6 @@
 
 
       delete allknn;
-            
-      
-      // Build the reference tree.
-      Log::Info << "Building reference tree..." << endl;
-      Timer::Start("tree_building");
-
-      Timer::Stop("tree_building");
     }
   }
   else // Cover trees.

Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp	Wed Jul  2 14:36:35 2014
@@ -252,6 +252,8 @@
   }
   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 @@
     // 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);