[mlpack-svn] r16743 - in mlpack/trunk/src/mlpack/core/tree: . rectangle_tree

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

Author: andrewmw94
Date: Wed Jul  2 16:09:43 2014
New Revision: 16743

Log:
work arround for CMake bug.

Modified:
   mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp
   mlpack/trunk/src/mlpack/core/tree/cover_tree.hpp
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree.hpp
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp

Modified: mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/binary_space_tree.hpp	Wed Jul  2 16:09:43 2014
@@ -10,7 +10,9 @@
 #include "bounds.hpp"
 #include "binary_space_tree/binary_space_tree.hpp"
 #include "binary_space_tree/single_tree_traverser.hpp"
+#include "binary_space_tree/single_tree_traverser_impl.hpp"
 #include "binary_space_tree/dual_tree_traverser.hpp"
+#include "binary_space_tree/dual_tree_traverser_impl.hpp"
 #include "binary_space_tree/traits.hpp"
 
 #endif

Modified: mlpack/trunk/src/mlpack/core/tree/cover_tree.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/cover_tree.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/cover_tree.hpp	Wed Jul  2 16:09:43 2014
@@ -10,7 +10,9 @@
 #include "bounds.hpp"
 #include "cover_tree/cover_tree.hpp"
 #include "cover_tree/single_tree_traverser.hpp"
+#include "cover_tree/single_tree_traverser_impl.hpp"
 #include "cover_tree/dual_tree_traverser.hpp"
+#include "cover_tree/dual_tree_traverser_impl.hpp"
 #include "cover_tree/traits.hpp"
 
 #endif

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree.hpp	Wed Jul  2 16:09:43 2014
@@ -14,7 +14,9 @@
 #include "bounds.hpp"
 #include "rectangle_tree/rectangle_tree.hpp"
 #include "rectangle_tree/single_tree_traverser.hpp"
+#include "rectangle_tree/single_tree_traverser_impl.hpp"
 #include "rectangle_tree/dual_tree_traverser.hpp"
+#include "rectangle_tree/dual_tree_traverser_impl.hpp"
 #include "rectangle_tree/r_tree_split.hpp"
 #include "rectangle_tree/r_tree_descent_heuristic.hpp"
 #include "rectangle_tree/traits.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 16:09:43 2014
@@ -26,9 +26,7 @@
 SingleTreeTraverser<RuleType>::SingleTreeTraverser(RuleType& rule) :
     rule(rule),
     numPrunes(0)
-{ 
-  std::cout << "constructing traverser" << std::endl;
-  /* Nothing to do */ }
+{ /* Nothing to do */ }
 
 template<typename SplitType,
          typename DescentType,
@@ -41,10 +39,10 @@
     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()) {
+    std::cout << "we reached a leaf" << std::endl;
     for(size_t i = 0; i < referenceNode.Count(); i++) {
       rule.BaseCase(queryIndex, referenceNode.Points()[i]);
     }
@@ -66,6 +64,7 @@
     if(rule.Rescore(queryIndex, *nodesAndScores[i].node, nodesAndScores[i].score) != DBL_MAX)
       Traverse(queryIndex, nodesAndScores[i].node);
     else {
+      std::cout << "we are pruning: " << referenceNode.NumChildren() - i << " nodes." << std::endl;
       numPrunes += referenceNode.NumChildren() - i;
       return;
     }