[mlpack-git] master: 1 : fix style 2 : remove useless header 3 : reduce temporary variable (54c7f22)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ebf77f8b13323a87c433b6f639deb2369188b00c...b08ae02b90e18f97366b236e7a4d8725cd6e9050

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

commit 54c7f22a6ddaf68cca491ad098cc27324740a8fa
Author: stereomatchingkiss <stereomatchingkiss at gmail.com>
Date:   Wed Apr 20 14:46:09 2016 +0800

    1 : fix style
    2 : remove useless header
    3 : reduce temporary variable


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

54c7f22a6ddaf68cca491ad098cc27324740a8fa
 src/mlpack/core/util/split_data.hpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/mlpack/core/util/split_data.hpp b/src/mlpack/core/util/split_data.hpp
index 04fc6f0..1ddd3a7 100644
--- a/src/mlpack/core/util/split_data.hpp
+++ b/src/mlpack/core/util/split_data.hpp
@@ -3,11 +3,7 @@
 
 #include <mlpack/core.hpp>
 
-#include <iterator>
-#include <numeric>
-#include <random>
 #include <tuple>
-#include <vector>
 
 namespace mlpack {
 namespace util {
@@ -34,26 +30,25 @@ namespace util {
  *@endcode
  */
 template<typename T, typename U>
-void TrainTestSplit(arma::Mat<T> const &input,
-                    arma::Row<U> const &inputLabel,
+void TrainTestSplit(const arma::Mat<T> &input,
+                    const arma::Row<U> &inputLabel,
                     arma::Mat<T> &trainData,
                     arma::Mat<T> &testData,
                     arma::Row<U> &trainLabel,
                     arma::Row<U> &testLabel,
-                    double const testRatio)
+                    const double testRatio)
 {
   size_t const testSize =
       static_cast<size_t>(input.n_cols * testRatio);
-  size_t const trainSize = input.n_cols - testSize;
+  const size_t trainSize = input.n_cols - testSize;
   trainData.set_size(input.n_rows, trainSize);
   testData.set_size(input.n_rows, testSize);
   trainLabel.set_size(trainSize);
   testLabel.set_size(testSize);
 
-  using Col = arma::Col<size_t>;
-  Col const sequence = arma::linspace<Col>(0, input.n_cols - 1,
-                                           input.n_cols);
-  arma::Col<size_t> const order = arma::shuffle(sequence);
+  const arma::Col<size_t> order =
+      arma::shuffle(arma::linspace<arma::Col<size_t>>(0, input.n_cols - 1,
+                                                      input.n_cols));
 
   for(size_t i = 0; i != trainSize; ++i)
   {
@@ -84,9 +79,9 @@ void TrainTestSplit(arma::Mat<T> const &input,
 template<typename T,typename U>
 std::tuple<arma::Mat<T>, arma::Mat<T>,
 arma::Row<U>, arma::Row<U>>
-TrainTestSplit(arma::Mat<T> const &input,
-               arma::Row<U> const &inputLabel,
-               double const testRatio)
+TrainTestSplit(const arma::Mat<T> &input,
+               const arma::Row<U> &inputLabel,
+               const double testRatio)
 {
   arma::Mat<T> trainData;
   arma::Mat<T> testData;