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

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

Author: andrewmw94
Date: Mon Jun  9 14:06:25 2014
New Revision: 16678

Log:
fixed some mistakes.  Still commented out to allow build.

Modified:
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree.hpp
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser.hpp
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser_impl.hpp
   mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cpp

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	Mon Jun  9 14:06:25 2014
@@ -5,8 +5,8 @@
  * Include all the necessary filse to use the Rectangle Type Trees (RTree, RStarTree, XTree,
  * and HilbertRTree.)
  */
-#ifndef __MLPACK_CORE_TREE_RECTINGLE_TREE_RECTANGLE_TREE_HPP
-#define __MLPACK_CORE_TREE_RECTINGLE_TREE_RECTANGLE_TREE_HPP
+#ifndef __MLPACK_CORE_TREE_RECTANGLE_TREE_HPP
+#define __MLPACK_CORE_TREE_RECTANGLE_TREE_HPP
 
 /* we include bounds.hpp since it gives us the necessary files.
  * However, we will not use the "ballbounds" option.

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp	Mon Jun  9 14:06:25 2014
@@ -4,13 +4,18 @@
  *
  * Definition of generalized rectangle type trees (r_tree, r_star_tree, x_tree, and hilbert_r_tree).
  */
-#ifndef __MLPACK_CORE_TREE_RECTINGLE_TREE_RECTANGLE_TREE_HPP
-#define __MLPACK_CORE_TREE_RECTINGLE_TREE_RECTANGLE_TREE_HPP
+#ifndef __MLPACK_CORE_TREE_RECTANGLE_TREE_RECTANGLE_TREE_HPP
+#define __MLPACK_CORE_TREE_RECTANGLE_TREE_RECTANGLE_TREE_HPP
 
 #include <mlpack/core.hpp>
 
+#include "../hrectbound.hpp"
 #include "../statistic.hpp"
 
+#ifdef __MLPACK_CORE_TREE_HRECTBOUND_HPP
+#define max(a, b) 5  //something to break the build
+#endif
+
 namespace mlpack {
 namespace tree /** Trees and tree-building procedures. */ {
 
@@ -30,10 +35,10 @@
  * @tparam DescentType The heuristic to use when descending the tree to insert points.
  */   
 
-template<typename StatisticType = EmptyStatistic,
-	 typename MatType = arma::mat,
-	 typename SplitType = EmptySplit,
-	 typename DescentType = EmptyDescent>
+template<typename SplitType,
+	 typename DescentType,
+	 typename StatisticType = EmptyStatistic,
+	 typename MatType = arma::mat>
 class RectangleTree
 {
  private:
@@ -183,7 +188,7 @@
   arma::mat& Dataset() { return dataset; }
 
   //! Get the metric which the tree uses.
-  typename BoundType::MetricType Metric() const { return bound.Metric(); }
+  typename HRectBound::MetricType Metric() const { return bound.Metric(); }
 
   //! Get the centroid of the node and store it in the given vector.
   void Centroid(arma::vec& centroid) { bound.Centroid(centroid); }

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp	Mon Jun  9 14:06:25 2014
@@ -17,10 +17,10 @@
 namespace mlpack {
 namespace tree {
 
-template<typename StatisticType,
-	 typename MatType,
-	 typename SplitType,
-	 typename DescentType>
+template<typename SplitType,
+         typename DescentType,
+	 typename StatisticType,
+         typename MatType>
 RectangleTree<StatisticType, MatType, SplitType, DescentType>::RectangleTree(
     MatType& data,
     const size_t maxLeafSize,
@@ -319,7 +319,7 @@
 	   typename MatType,
 	   typename SplitType,
 	 typename DescentType>
-std::string BinarySpaceTree<StatisticType, MatType, SplitType, DescentType>::ToString() const
+std::string RectangleTree<StatisticType, MatType, SplitType, DescentType>::ToString() const
 {
   std::ostringstream convert;
   convert << "RectangleTree [" << this << "]" << std::endl;

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser.hpp	Mon Jun  9 14:06:25 2014
@@ -16,10 +16,10 @@
 namespace mlpack {
 namespace tree {
 
-template<typename StatisticType,
-         typename MatType,
-         typename SplitType,
-         typename DescentType>
+template<typename SplitType,
+         typename DescentType,
+	 typename StatisticType,
+         typename MatType>
 template<typename RuleType>
 class RectangleTree<StatisticType, MatType, SplitType, DescentType>::
     RectangleTreeTraverser

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/rectangle_tree_traverser_impl.hpp	Mon Jun  9 14:06:25 2014
@@ -17,10 +17,10 @@
 namespace mlpack {
 namespace tree {
 
-template<typename StatisticType,
-    typename MatType,
-    typename SplitType,
-    typename DescentType>
+template<typename SplitType,
+         typename DescentType,
+	 typename StatisticType,
+         typename MatType>
 template<typename RuleType>
 RectangleTree<StatisticType, MatType, SplitType, DescentType>::
 RectangleTreeTraverser<RuleType>::RectangleTreeTraverser(RuleType& rule) :

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	Mon Jun  9 14:06:25 2014
@@ -272,11 +272,11 @@
       // Build the reference tree.
       Log::Info << "Building reference tree..." << endl;
       Timer::Start("tree_building");
-//       RectangleTree<NeighborSearchStat<NearestNeighborSort>,
-//                                  arma::mat,
-//                                  tree::RTreeSplit,
-//                                  tree::RTreeDescentHeuristic>
-//       refTree(referenceData, leafSize);
+//        RectangleTree<NeighborSearchStat<NearestNeighborSort>,
+//                                   arma::mat,
+//                                   tree::RTreeSplit,
+//                                   tree::RTreeDescentHeuristic>
+//        refTree(referenceData, leafSize);
       Timer::Stop("tree_building");
         
     }