[mlpack] 54/324: more of the same.

Barak A. Pearlmutter barak+git at cs.nuim.ie
Sun Aug 17 08:21:55 UTC 2014


This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch svn-trunk
in repository mlpack.

commit b6595ae7da71404b3952c282895b1d673b9baaf5
Author: andrewmw94 <andrewmw94 at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Wed Jun 11 20:12:16 2014 +0000

    more of the same.
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@16683 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 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 {
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git



More information about the debian-science-commits mailing list