[mlpack-git] master: Return MatType instead of arma::mat. (86f647c)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Apr 23 18:01:16 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/97f2c927256ad6fb6206f3f5446a433ef84574c9...86f647ca937380cf2ea2569ba5735dcdcc659730

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

commit 86f647ca937380cf2ea2569ba5735dcdcc659730
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Fri Apr 24 00:01:06 2015 +0200

    Return MatType instead of arma::mat.


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

86f647ca937380cf2ea2569ba5735dcdcc659730
 src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
index 95189db..a62988e 100644
--- a/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/rectangle_tree.hpp
@@ -303,9 +303,9 @@ class RectangleTree
   RectangleTree*& Parent() { return parent; }
 
   //! Get the dataset which the tree is built on.
-  const arma::mat& Dataset() const { return dataset; }
+  const MatType& Dataset() const { return dataset; }
   //! Modify the dataset which the tree is built on.  Be careful!
-  arma::mat& Dataset() { return const_cast<arma::mat&>(dataset); }
+  MatType& Dataset() { return const_cast<MatType&>(dataset); }
 
   //! Get the points vector for this node.
   const std::vector<size_t>& Points() const { return points; }
@@ -313,9 +313,9 @@ class RectangleTree
   std::vector<size_t>& Points() { return points; }
 
   //! Get the local dataset of this node.
-  const arma::mat& LocalDataset() const { return *localDataset; }
+  const MatType& LocalDataset() const { return *localDataset; }
   //! Modify the local dataset of this node.
-  arma::mat& LocalDataset() { return *localDataset; }
+  MatType& LocalDataset() { return *localDataset; }
 
   //! Get the metric which the tree uses.
   typename HRectBound<>::MetricType Metric() const { return bound.Metric(); }



More information about the mlpack-git mailing list