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

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

Author: andrewmw94
Date: Wed Jun 11 16:12:16 2014
New Revision: 16683

Log:
more of the same.

Modified:
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp
   mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp
   mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search.hpp

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp	Wed Jun 11 16:12:16 2014
@@ -17,7 +17,7 @@
  * When descending a Rectangle tree to insert a point, we need to have a way to choose
  * a child node when the point isn't enclosed by any of them.  This heuristic is used to do so.
  */
-class RTreeDescentHueristic
+class RTreeDescentHeuristic
 {
  public:
   /**
@@ -29,6 +29,7 @@
    * @param point The point that is being inserted.
    */
   static double EvalNode(const HRectBound<>& bound, const arma::vec& point);
+  
 };
 
 }; // namespace tree

Modified: mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp	Wed Jun 11 16:12:16 2014
@@ -10,10 +10,6 @@
 
 #include "r_tree_descent_heuristic.hpp"
 
-#ifndef __MLPACK_CORE_TREE_RECTANGLE_TREE_R_TREE_DESCENT_HEURISTIC_HPP
-#define max(a, b) 4*max(a-1, b-1)
-#endif
-
 namespace mlpack {
 namespace tree {
 

Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search.hpp
==============================================================================