[mlpack-git] master: Combine SplitType's constructors. (019680f)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/4c8a8d1ccbc33916794fe0f6142fa5378ff8503d...93eb34cc4daf08cc331d1a22fccf44950b276daa

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

commit 019680f96d86eecf70b675a617db23a6eacc5e5a
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date:   Tue May 3 23:17:08 2016 +0300

    Combine SplitType's constructors.


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

019680f96d86eecf70b675a617db23a6eacc5e5a
 src/mlpack/core/tree/rectangle_tree/r_star_tree_split.hpp    |  3 ---
 .../core/tree/rectangle_tree/r_star_tree_split_impl.hpp      |  6 ------
 src/mlpack/core/tree/rectangle_tree/r_tree_split.hpp         |  3 ---
 src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp    |  6 ------
 src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp  |  2 +-
 src/mlpack/core/tree/rectangle_tree/x_tree_split.hpp         |  3 ---
 src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp    | 12 +++---------
 7 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree/r_star_tree_split.hpp b/src/mlpack/core/tree/rectangle_tree/r_star_tree_split.hpp
index e3550ff..d17abf6 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_star_tree_split.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_star_tree_split.hpp
@@ -28,9 +28,6 @@ class RStarTreeSplit
   //! Construct this with the specified node.
   RStarTreeSplit(const TreeType *node);
 
-  //! Construct this with the specified node and the parent of the node.
-  RStarTreeSplit(const TreeType *node,const TreeType *parentNode);
-
   //! Create a copy of the other.split.
   RStarTreeSplit(const TreeType &other);
 
diff --git a/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp b/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
index f233ff7..49adbe8 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
@@ -28,12 +28,6 @@ RStarTreeSplit<TreeType>::RStarTreeSplit(const TreeType *)
 }
 
 template<typename TreeType>
-RStarTreeSplit<TreeType>::RStarTreeSplit(const TreeType *,const TreeType *)
-{
-
-}
-
-template<typename TreeType>
 RStarTreeSplit<TreeType>::RStarTreeSplit(const TreeType &)
 {
 
diff --git a/src/mlpack/core/tree/rectangle_tree/r_tree_split.hpp b/src/mlpack/core/tree/rectangle_tree/r_tree_split.hpp
index 5312125..a77308a 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_tree_split.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_tree_split.hpp
@@ -28,9 +28,6 @@ class RTreeSplit
   //! Construct this with the specified node.
   RTreeSplit(const TreeType *node);
 
-  //! Construct this with the specified node and the parent of the node.
-  RTreeSplit(const TreeType *node,const TreeType *parentNode);
-
   //! Create a copy of the other.split.
   RTreeSplit(const TreeType &other);
 
diff --git a/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp b/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp
index f315e3c..442e49f 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp
@@ -27,12 +27,6 @@ RTreeSplit<TreeType>::RTreeSplit(const TreeType *)
 }
 
 template<typename TreeType>
-RTreeSplit<TreeType>::RTreeSplit(const TreeType *,const TreeType *)
-{
-
-}
-
-template<typename TreeType>
 RTreeSplit<TreeType>::RTreeSplit(const TreeType &)
 {
 
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 6793649..8184f89 100644
--- a/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
@@ -124,7 +124,7 @@ RectangleTree(
                                                   maxLeafSize + 1)))
 {
   stat = StatisticType(*this);
-  split = SplitType<RectangleTree>(this,parentNode);
+  split = SplitType<RectangleTree>(this);
 }
 
 /**
diff --git a/src/mlpack/core/tree/rectangle_tree/x_tree_split.hpp b/src/mlpack/core/tree/rectangle_tree/x_tree_split.hpp
index 8d3e5d8..7b120a9 100644
--- a/src/mlpack/core/tree/rectangle_tree/x_tree_split.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/x_tree_split.hpp
@@ -38,9 +38,6 @@ class XTreeSplit
   //! Construct this with the specified node.
   XTreeSplit(const TreeType *node);
 
-  //! Construct this with the specified node and the parent of the node.
-  XTreeSplit(const TreeType *node,const TreeType *parentNode);
-
   //! Create a copy of the other.split.
   XTreeSplit(const TreeType &other);
 
diff --git a/src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp b/src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp
index 1bde106..a619b72 100644
--- a/src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp
@@ -24,15 +24,9 @@ XTreeSplit<TreeType>::XTreeSplit() :
 
 template<typename TreeType>
 XTreeSplit<TreeType>::XTreeSplit(const TreeType *node) :
-    normalNodeMaxNumChildren(node->MaxNumChildren()),
-    splitHistory(node->Bound().Dim())
-{
-
-}
-
-template<typename TreeType>
-XTreeSplit<TreeType>::XTreeSplit(const TreeType *node,const TreeType *parent) :
-    normalNodeMaxNumChildren(parent->Split().NormalNodeMaxNumChildren()),
+    normalNodeMaxNumChildren(node->Parent() ? 
+                             node->Parent()->Split().NormalNodeMaxNumChildren() :
+                             node->MaxNumChildren()),
     splitHistory(node->Bound().Dim())
 {