[mlpack-git] master,mlpack-1.0.x: more of the same. (c380e58)

[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 c380e58c35136f204e5ddddc337d138ef680b453
Author: andrewmw94 <andrewmw94 at gmail.com>
Date:   Wed Jun 11 20:12:16 2014 +0000

    more of the same.


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

c380e58c35136f204e5ddddc337d138ef680b453
 src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp      | 3 ++-
 src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp b/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp
index c6593b2..d757777 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic.hpp
@@ -17,7 +17,7 @@ namespace tree /** Trees and tree-building procedures. */ {
  * 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 @@ class RTreeDescentHueristic
    * @param point The point that is being inserted.
    */
   static double EvalNode(const HRectBound<>& bound, const arma::vec& point);
+  
 };
 
 }; // namespace tree
diff --git a/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp b/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp
index 1ec8130..8ca04da 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_tree_descent_heuristic_impl.hpp
@@ -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 {