[mlpack-git] master: Allow BoundType to have multiple template parameters. (5006220)
gitdub at mlpack.org
gitdub at mlpack.org
Mon Mar 7 14:59:46 EST 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/f45c17bc4d70ee5d82bf11a91850a34b814eccff...a69871c4eb63087c825502fd2277565453720568
>---------------------------------------------------------------
commit 50062206eec41768bd9a4b1e818a26c42dc4f6ab
Author: Ryan Curtin <ryan at ratml.org>
Date: Thu Jan 28 12:05:39 2016 +0000
Allow BoundType to have multiple template parameters.
This is a useful pattern in general, but here its application is to allow
BoundType to have an additional ElemType template parameter.
>---------------------------------------------------------------
50062206eec41768bd9a4b1e818a26c42dc4f6ab
.../tree/binary_space_tree/binary_space_tree.hpp | 3 +-
.../binary_space_tree/binary_space_tree_impl.hpp | 54 +++++++++++-----------
.../breadth_first_dual_tree_traverser.hpp | 2 +-
.../breadth_first_dual_tree_traverser_impl.hpp | 6 +--
.../tree/binary_space_tree/dual_tree_traverser.hpp | 2 +-
.../binary_space_tree/dual_tree_traverser_impl.hpp | 4 +-
.../binary_space_tree/single_tree_traverser.hpp | 2 +-
.../single_tree_traverser_impl.hpp | 4 +-
src/mlpack/core/tree/binary_space_tree/traits.hpp | 2 +-
9 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp b/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp
index 21e789d..ccd7fc0 100644
--- a/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/binary_space_tree.hpp
@@ -42,7 +42,8 @@ namespace tree /** Trees and tree-building procedures. */ {
template<typename MetricType,
typename StatisticType = EmptyStatistic,
typename MatType = arma::mat,
- template<typename BoundMetricType> class BoundType = bound::HRectBound,
+ template<typename BoundMetricType, typename...> class BoundType =
+ bound::HRectBound,
template<typename SplitBoundType, typename SplitMatType>
class SplitType = MidpointSplit>
class BinarySpaceTree
diff --git a/src/mlpack/core/tree/binary_space_tree/binary_space_tree_impl.hpp b/src/mlpack/core/tree/binary_space_tree/binary_space_tree_impl.hpp
index 6f7bbb4..d19937b 100644
--- a/src/mlpack/core/tree/binary_space_tree/binary_space_tree_impl.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/binary_space_tree_impl.hpp
@@ -22,7 +22,7 @@ namespace tree {
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -49,7 +49,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -82,7 +82,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -121,7 +121,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -146,7 +146,7 @@ BinarySpaceTree(MatType&& data, const size_t maxLeafSize) :
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -179,7 +179,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -218,7 +218,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -246,7 +246,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -279,7 +279,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -322,7 +322,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -381,7 +381,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -416,7 +416,7 @@ BinarySpaceTree(BinarySpaceTree&& other) :
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename Archive>
@@ -439,7 +439,7 @@ BinarySpaceTree(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -456,7 +456,7 @@ BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline bool BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -471,7 +471,7 @@ inline bool BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -492,7 +492,7 @@ inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline double BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -515,7 +515,7 @@ inline double BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline double BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -528,7 +528,7 @@ inline double BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline double BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -543,7 +543,7 @@ inline double BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -563,7 +563,7 @@ inline BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -581,7 +581,7 @@ inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -596,7 +596,7 @@ inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -611,7 +611,7 @@ inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
@@ -623,7 +623,7 @@ inline size_t BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
void BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -679,7 +679,7 @@ void BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
void BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -738,7 +738,7 @@ SplitNode(std::vector<size_t>& oldFromNew,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
@@ -762,7 +762,7 @@ BinarySpaceTree<MetricType, StatisticType, MatType, BoundType, SplitType>::
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename Archive>
diff --git a/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp b/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp
index 0f8c3ce..8c142ca 100644
--- a/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser.hpp
@@ -31,7 +31,7 @@ struct QueueFrame
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
diff --git a/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser_impl.hpp b/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser_impl.hpp
index a6fcb08..78c98b7 100644
--- a/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser_impl.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/breadth_first_dual_tree_traverser_impl.hpp
@@ -18,7 +18,7 @@ namespace tree {
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
@@ -46,7 +46,7 @@ bool operator<(const QueueFrame<TreeType, TraversalInfoType>& a,
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
@@ -86,7 +86,7 @@ BreadthFirstDualTreeTraverser<RuleType>::Traverse(
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
diff --git a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp
index 1a05f39..a9032fc 100644
--- a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp
@@ -20,7 +20,7 @@ namespace tree {
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
diff --git a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp
index 42f3772..1d9d96d 100644
--- a/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp
@@ -18,7 +18,7 @@ namespace tree {
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
@@ -34,7 +34,7 @@ DualTreeTraverser<RuleType>::DualTreeTraverser(RuleType& rule) :
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
diff --git a/src/mlpack/core/tree/binary_space_tree/single_tree_traverser.hpp b/src/mlpack/core/tree/binary_space_tree/single_tree_traverser.hpp
index c48069e..2c67256 100644
--- a/src/mlpack/core/tree/binary_space_tree/single_tree_traverser.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/single_tree_traverser.hpp
@@ -19,7 +19,7 @@ namespace tree {
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
diff --git a/src/mlpack/core/tree/binary_space_tree/single_tree_traverser_impl.hpp b/src/mlpack/core/tree/binary_space_tree/single_tree_traverser_impl.hpp
index fba9e06..2db2128 100644
--- a/src/mlpack/core/tree/binary_space_tree/single_tree_traverser_impl.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/single_tree_traverser_impl.hpp
@@ -20,7 +20,7 @@ namespace tree {
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
@@ -33,7 +33,7 @@ SingleTreeTraverser<RuleType>::SingleTreeTraverser(RuleType& rule) :
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
template<typename RuleType>
diff --git a/src/mlpack/core/tree/binary_space_tree/traits.hpp b/src/mlpack/core/tree/binary_space_tree/traits.hpp
index 44e42b4..7cd7f65 100644
--- a/src/mlpack/core/tree/binary_space_tree/traits.hpp
+++ b/src/mlpack/core/tree/binary_space_tree/traits.hpp
@@ -21,7 +21,7 @@ namespace tree {
template<typename MetricType,
typename StatisticType,
typename MatType,
- template<typename BoundMetricType> class BoundType,
+ template<typename BoundMetricType, typename...> class BoundType,
template<typename SplitBoundType, typename SplitMatType>
class SplitType>
class TreeTraits<BinarySpaceTree<MetricType, StatisticType, MatType, BoundType,
More information about the mlpack-git
mailing list