[mlpack] 60/207: Remove unnecessary class names to fix Windows build.

Barak A. Pearlmutter barak+git at pearlmutter.net
Thu Mar 23 17:53:40 UTC 2017


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

bap pushed a commit to branch master
in repository mlpack.

commit 9445e21336d82fe3d2a37873650253935142b3e1
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Feb 17 10:17:40 2017 -0500

    Remove unnecessary class names to fix Windows build.
---
 src/mlpack/methods/decision_tree/all_categorical_split_impl.hpp    | 7 +++----
 .../methods/decision_tree/best_binary_numeric_split_impl.hpp       | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/mlpack/methods/decision_tree/all_categorical_split_impl.hpp b/src/mlpack/methods/decision_tree/all_categorical_split_impl.hpp
index 48a8d26..3b7941b 100644
--- a/src/mlpack/methods/decision_tree/all_categorical_split_impl.hpp
+++ b/src/mlpack/methods/decision_tree/all_categorical_split_impl.hpp
@@ -20,8 +20,7 @@ double AllCategoricalSplit<FitnessFunction>::SplitIfBetter(
     const size_t numClasses,
     const size_t minimumLeafSize,
     arma::Col<typename VecType::elem_type>& classProbabilities,
-    AllCategoricalSplit::AuxiliarySplitInfo<typename VecType::elem_type>&
-        /* aux */)
+    AuxiliarySplitInfo<typename VecType::elem_type>& /* aux */)
 {
   // Count the number of elements in each potential child.
   const double epsilon = 1e-7; // Tolerance for floating-point errors.
@@ -76,7 +75,7 @@ template<typename FitnessFunction>
 template<typename ElemType>
 size_t AllCategoricalSplit<FitnessFunction>::NumChildren(
     const arma::Col<ElemType>& classProbabilities,
-    const AllCategoricalSplit::AuxiliarySplitInfo<ElemType>& /* aux */)
+    const AuxiliarySplitInfo<ElemType>& /* aux */)
 {
   return classProbabilities[0];
 }
@@ -86,7 +85,7 @@ template<typename ElemType>
 size_t AllCategoricalSplit<FitnessFunction>::CalculateDirection(
     const ElemType& point,
     const arma::Col<ElemType>& /* classProbabilities */,
-    const AllCategoricalSplit::AuxiliarySplitInfo<ElemType>& /* aux */)
+    const AuxiliarySplitInfo<ElemType>& /* aux */)
 {
   return (size_t) point;
 }
diff --git a/src/mlpack/methods/decision_tree/best_binary_numeric_split_impl.hpp b/src/mlpack/methods/decision_tree/best_binary_numeric_split_impl.hpp
index 720af4b..154a78a 100644
--- a/src/mlpack/methods/decision_tree/best_binary_numeric_split_impl.hpp
+++ b/src/mlpack/methods/decision_tree/best_binary_numeric_split_impl.hpp
@@ -19,8 +19,7 @@ double BestBinaryNumericSplit<FitnessFunction>::SplitIfBetter(
     const size_t numClasses,
     const size_t minimumLeafSize,
     arma::Col<typename VecType::elem_type>& classProbabilities,
-    BestBinaryNumericSplit::AuxiliarySplitInfo<typename VecType::elem_type>&
-        /* aux */)
+    AuxiliarySplitInfo<typename VecType::elem_type>& /* aux */)
 {
   // First sanity check: if we don't have enough points, we can't split.
   if (data.n_elem < (minimumLeafSize * 2))
@@ -85,8 +84,7 @@ template<typename ElemType>
 size_t BestBinaryNumericSplit<FitnessFunction>::CalculateDirection(
     const ElemType& point,
     const arma::Col<ElemType>& classProbabilities,
-    const BestBinaryNumericSplit<FitnessFunction>::AuxiliarySplitInfo<ElemType>&
-        /* aux */)
+    const AuxiliarySplitInfo<ElemType>& /* aux */)
 {
   if (point <= classProbabilities[0])
     return 0; // Go left.

-- 
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