[mlpack-git] master,mlpack-1.0.x: more R tree stuff. (7df5091)

[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 7df5091e678d85630fdb243bc1443189326912e9
Author: andrewmw94 <andrewmw94 at gmail.com>
Date:   Tue May 27 12:17:52 2014 +0000

    more R tree stuff.


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

7df5091e678d85630fdb243bc1443189326912e9
 src/mlpack/core/tree/rectangle_tree.hpp                   |  4 ++--
 .../core/tree/rectangle_tree/rectangle_tree_impl.hpp      | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree.hpp b/src/mlpack/core/tree/rectangle_tree.hpp
index 12f30fd..7330adc 100644
--- a/src/mlpack/core/tree/rectangle_tree.hpp
+++ b/src/mlpack/core/tree/rectangle_tree.hpp
@@ -5,8 +5,8 @@
  * Include all the necessary filse to use the Rectangle Type Trees (RTree, RStarTree, XTree,
  * and HilbertRTree.)
  */
-#ifndef __MLPACK_CORE_TREE_RECTINGLINEAR_TREE_RECTANGLINEAR_TREE_HPP
-#define __MLPACK_CORE_TREE_RECTINGLINEAR_TREE_RECTANGLINEAR_TREE_HPP
+#ifndef __MLPACK_CORE_TREE_RECTINGLE_TREE_RECTANGLE_TREE_HPP
+#define __MLPACK_CORE_TREE_RECTINGLE_TREE_RECTANGLE_TREE_HPP
 
 /* we include bounds.hpp since it gives us the necessary files.
  * However, we will not use the "ballbounds" option.
diff --git a/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp b/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
index ddc009c..0968edc 100644
--- a/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
@@ -35,20 +35,21 @@ RectangleTree<StatisticType, MatType, SplitType>::RectangleTree(
  */
 template<typename StatisticType,
 	 typename MatType,
-	 typename SplitType>
-RectangleTree<StatisticType, MatType, SplitType>::
+	 typename SplitType
+	 typename HueristicType>
+RectangleTree<StatisticType, MatType, SplitType, HueristicType>::
     InsertPoint(const arma::vec& point)
 {
   if(numChildren == 0) {
-    data[points++] = point;
+    data.col(points++) = point;
     return;
   }
-  double minDist = children[0].minDistance(point);
+  double minScore = HueristicType.EvalNode(children[0].bound, point);
   int bestIndex = 0;
   for(int i = 1; i < numChildren; i++) {
-    double dist = children[i].minDistance(point);
-    if(dist < minDist) {
-      minDist = dist;
+    double score = HueristicType.EvalNode(children[i].bound, point);
+    if(score < minScore) {
+      minScore = score;
       bestIndex = i
     }
   }