[mlpack-git] master: Remove using declaration. (b4b7e8a)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Sun Oct 11 16:26:20 EDT 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/7e6fe3f1c25445dfd41c747839aa1fbf1c31a776...6e9a7465d7739e05e6b4aa650e1f87c45e9cd656
>---------------------------------------------------------------
commit b4b7e8ab011388377744a7ab8d64568ffea3f9f7
Author: Ryan Curtin <ryan at ratml.org>
Date: Sun Oct 11 14:18:41 2015 -0400
Remove using declaration.
>---------------------------------------------------------------
b4b7e8ab011388377744a7ab8d64568ffea3f9f7
src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp | 12 +++++-------
src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
index b549621..f12e326 100644
--- a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
@@ -18,8 +18,6 @@
namespace mlpack {
namespace tree /** Trees and tree-building procedures. */ {
-using bound::HRectBound;
-
/**
* A rectangle type tree tree, such as an R-tree or X-tree. Once the
* bound and type of dataset is defined, the tree will construct itself. Call
@@ -90,7 +88,7 @@ class RectangleTree
//! The minimum leaf size.
size_t minLeafSize;
//! The bound object for this node.
- HRectBound<metric::EuclideanDistance> bound;
+ bound::HRectBound<metric::EuclideanDistance> bound;
//! Any extra data contained in the node.
StatisticType stat;
//! A struct to store the "split history" for X trees.
@@ -266,9 +264,9 @@ class RectangleTree
RectangleTree* FindByBeginCount(size_t begin, size_t count);
//! Return the bound object for this node.
- const HRectBound<MetricType>& Bound() const { return bound; }
+ const bound::HRectBound<MetricType>& Bound() const { return bound; }
//! Modify the bound object for this node.
- HRectBound<MetricType>& Bound() { return bound; }
+ bound::HRectBound<MetricType>& Bound() { return bound; }
//! Return the statistic object for this node.
const StatisticType& Stat() const { return stat; }
@@ -492,7 +490,7 @@ class RectangleTree
*/
RectangleTree(const size_t begin,
const size_t count,
- HRectBound<MetricType> bound,
+ bound::HRectBound<MetricType> bound,
StatisticType stat,
const int maxLeafSize = 20) :
begin(begin),
@@ -545,7 +543,7 @@ class RectangleTree
* shrinking.
* @return true if the bound needed to be changed, false if it did not.
*/
- bool ShrinkBoundForBound(const HRectBound<MetricType>& changedBound);
+ bool ShrinkBoundForBound(const bound::HRectBound<MetricType>& changedBound);
/**
* Make an exact copy of this node, pointers and everything.
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 6d8cc46..c733817 100644
--- a/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/rectangle_tree_impl.hpp
@@ -820,7 +820,7 @@ template<typename MetricType,
typename SplitType,
typename DescentType>
bool RectangleTree<MetricType, StatisticType, MatType, SplitType, DescentType>::
- ShrinkBoundForBound(const HRectBound<MetricType>& /* b */)
+ ShrinkBoundForBound(const bound::HRectBound<MetricType>& /* b */)
{
// Using the sum is safe since none of the dimensions can increase.
double sum = 0;
More information about the mlpack-git
mailing list