[mlpack-git] master, mlpack-1.0.x: work arround for CMake bug. (e50716d)

[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 e50716d943cc5ccde3b8fe780d2d5deae2f471a8
Author: andrewmw94 <andrewmw94 at gmail.com>
Date:   Wed Jul 2 20:09:43 2014 +0000

    work arround for CMake bug.


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

e50716d943cc5ccde3b8fe780d2d5deae2f471a8
 src/mlpack/core/tree/binary_space_tree.hpp                         | 2 ++
 src/mlpack/core/tree/cover_tree.hpp                                | 2 ++
 src/mlpack/core/tree/rectangle_tree.hpp                            | 2 ++
 src/mlpack/core/tree/rectangle_tree/single_tree_traverser_impl.hpp | 7 +++----
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/core/tree/binary_space_tree.hpp b/src/mlpack/core/tree/binary_space_tree.hpp
index e0c94c6..f13977d 100644
--- a/src/mlpack/core/tree/binary_space_tree.hpp
+++ b/src/mlpack/core/tree/binary_space_tree.hpp
@@ -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
diff --git a/src/mlpack/core/tree/cover_tree.hpp b/src/mlpack/core/tree/cover_tree.hpp
index 19e92d0..553c31d 100644
--- a/src/mlpack/core/tree/cover_tree.hpp
+++ b/src/mlpack/core/tree/cover_tree.hpp
@@ -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
diff --git a/src/mlpack/core/tree/rectangle_tree.hpp b/src/mlpack/core/tree/rectangle_tree.hpp
index f0d156e..b7992e1 100644
--- a/src/mlpack/core/tree/rectangle_tree.hpp
+++ b/src/mlpack/core/tree/rectangle_tree.hpp
@@ -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"
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 ef4e071..d9f0d70 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,9 +26,7 @@ RectangleTree<SplitType, DescentType, StatisticType, MatType>::
 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 @@ 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()) {
+    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 @@ SingleTreeTraverser<RuleType>::Traverse(
     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;
     }