From 410bed0b7aa97b34ef988b037b8a3c4b393abe39 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Fri, 22 Apr 2016 09:03:23 -0400 Subject: [PATCH] Move SplitData to data namespace. It seems more appropriate to me; the util namespace primarily contains utilities for C++ programming in mlpack, whereas the data namespace contains utilities for manipulating data. --- src/mlpack/core/{util => data}/split_data.hpp | 4 ++-- src/mlpack/tests/split_data_test.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/mlpack/core/{util => data}/split_data.hpp (98%) diff --git a/src/mlpack/core/util/split_data.hpp b/src/mlpack/core/data/split_data.hpp similarity index 98% rename from src/mlpack/core/util/split_data.hpp rename to src/mlpack/core/data/split_data.hpp index e53299f021..1c33ba8fd1 100644 --- a/src/mlpack/core/util/split_data.hpp +++ b/src/mlpack/core/data/split_data.hpp @@ -4,7 +4,7 @@ #include namespace mlpack { -namespace util { +namespace data { /** *Split training data and test data @@ -95,7 +95,7 @@ TrainTestSplit(const arma::Mat &input, trainLabel, testLabel); } -} // namespace util +} // namespace data } // namespace mlpack #endif diff --git a/src/mlpack/tests/split_data_test.cpp b/src/mlpack/tests/split_data_test.cpp index 8ec45911c2..bb9cd8d4b7 100644 --- a/src/mlpack/tests/split_data_test.cpp +++ b/src/mlpack/tests/split_data_test.cpp @@ -4,15 +4,15 @@ * * Test the SparseAutoencoder class. */ - #include -#include +#include #include #include "old_boost_test_definitions.hpp" using namespace mlpack; using namespace arma; +using namespace mlpack::data; BOOST_AUTO_TEST_SUITE(SplitDataTest); @@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(SplitDataSplitResultMat) arma::linspace(0, input.n_cols-1, input.n_cols); - auto const value = util::TrainTestSplit(input, labels, 0.2); + auto const value = TrainTestSplit(input, labels, 0.2); BOOST_REQUIRE(std::get<0>(value).n_cols == 8); BOOST_REQUIRE(std::get<1>(value).n_cols == 2); BOOST_REQUIRE(std::get<2>(value).n_cols == 8);