[mlpack-git] master: Revert syntax for older Armadillo versions. (18415db)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Dec 23 11:43:56 EST 2015


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

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

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

commit 18415dbdca57657d8850a0237b362cf9a0f9ddcb
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Oct 1 18:43:08 2015 -0700

    Revert syntax for older Armadillo versions.


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

18415dbdca57657d8850a0237b362cf9a0f9ddcb
 src/mlpack/methods/hoeffding_trees/hoeffding_categorical_split_impl.hpp | 2 +-
 src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_categorical_split_impl.hpp b/src/mlpack/methods/hoeffding_trees/hoeffding_categorical_split_impl.hpp
index e4a5471..b3200db 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_categorical_split_impl.hpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_categorical_split_impl.hpp
@@ -50,7 +50,7 @@ void HoeffdingCategoricalSplit<FitnessFunction>::Split(
   for (size_t i = 0; i < sufficientStatistics.n_cols; ++i)
   {
     arma::uword maxIndex;
-    sufficientStatistics.col(i).max(maxIndex);
+    sufficientStatistics.unsafe_col(i).max(maxIndex);
     childMajorities[i] = size_t(maxIndex);
   }
 
diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp b/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp
index da426f1..1c7bc6e 100644
--- a/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp
+++ b/src/mlpack/methods/hoeffding_trees/hoeffding_numeric_split_impl.hpp
@@ -101,7 +101,7 @@ void HoeffdingNumericSplit<FitnessFunction, ObservationType>::Split(
   for (size_t i = 0; i < sufficientStatistics.n_cols; ++i)
   {
     arma::uword maxIndex;
-    sufficientStatistics.col(i).max(maxIndex);
+    sufficientStatistics.unsafe_col(i).max(maxIndex);
     childMajorities[i] = size_t(maxIndex);
   }
 



More information about the mlpack-git mailing list