[mlpack-git] master: Move SplitData to data namespace. (410bed0)

gitdub at mlpack.org gitdub at mlpack.org
Fri Apr 22 09:03:23 EDT 2016


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

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

commit 410bed0b7aa97b34ef988b037b8a3c4b393abe39
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Apr 22 09:03:23 2016 -0400

    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.


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

410bed0b7aa97b34ef988b037b8a3c4b393abe39
 src/mlpack/core/{util => data}/split_data.hpp | 4 ++--
 src/mlpack/tests/split_data_test.cpp          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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 e53299f..1c33ba8 100644
--- a/src/mlpack/core/util/split_data.hpp
+++ b/src/mlpack/core/data/split_data.hpp
@@ -4,7 +4,7 @@
 #include <mlpack/core.hpp>
 
 namespace mlpack {
-namespace util {
+namespace data {
 
 /**
  *Split training data and test data
@@ -95,7 +95,7 @@ TrainTestSplit(const arma::Mat<T> &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 8ec4591..bb9cd8d 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 <mlpack/core.hpp>
-#include <mlpack/core/util/split_data.hpp>
+#include <mlpack/core/data/split_data.hpp>
 
 #include <boost/test/unit_test.hpp>
 #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<Labels>(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);




More information about the mlpack-git mailing list