[mlpack-git] master: Add NumChildren() to use instead of Bins(). (d904de6)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/de9cc4b05069e1fa4793d9355f2f595af5ff45d2...6070527af14296cd99739de6c62666cc5d2a2125

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

commit d904de61d6a5328066f46238d3065f469e37ae28
Author: ryan <ryan at ratml.org>
Date:   Thu Oct 8 15:44:24 2015 -0400

    Add NumChildren() to use instead of Bins().


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

d904de61d6a5328066f46238d3065f469e37ae28
 src/mlpack/methods/hoeffding_trees/binary_numeric_split.hpp    | 3 +++
 src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split.hpp | 3 +++
 src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp    | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/methods/hoeffding_trees/binary_numeric_split.hpp b/src/mlpack/methods/hoeffding_trees/binary_numeric_split.hpp
index 5873594..fb715f7 100644
--- a/src/mlpack/methods/hoeffding_trees/binary_numeric_split.hpp
+++ b/src/mlpack/methods/hoeffding_trees/binary_numeric_split.hpp
@@ -53,6 +53,9 @@ class BinaryNumericSplit
   template<typename Archive>
   void Serialize(Archive& ar, const unsigned int /* version */);
 
+  // Return the number of children if this node were to split on this feature.
+  size_t NumChildren() const { return 2; }
+
  private:
   // All we need is ordered access.
   std::multimap<ObservationType, size_t> sortedElements;
diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split.hpp b/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split.hpp
index 2e233e6..e726c88 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split.hpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split.hpp
@@ -64,6 +64,9 @@ class HoeffdingNumericSplit
 
   size_t Bins() const { return bins; }
 
+  // Return the number of children if this node splits on this feature.
+  size_t NumChildren() const { return bins; }
+
   template<typename Archive>
   void Serialize(Archive& ar, const unsigned int /* version */);
 
diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp b/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
index 40a1eca..7f8306f 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_split_impl.hpp
@@ -189,7 +189,7 @@ size_t HoeffdingSplit<
     else
     {
       majorityClass = numericSplits[largestIndex].MajorityClass();
-      return numericSplits[largestIndex].Bins();
+      return numericSplits[largestIndex].NumChildren();
     }
   }
   else