From 6fe2dde181b4818d879dd6661597414472dea705 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Mon, 10 Feb 2014 15:00:21 +0000 Subject: [PATCH] Minor changes to tests; in some cases matrices/vectors are now initialized so they provide more output. --- src/mlpack/tests/to_string_test.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/mlpack/tests/to_string_test.cpp b/src/mlpack/tests/to_string_test.cpp index c7dbbefe43..359e776a1a 100644 --- a/src/mlpack/tests/to_string_test.cpp +++ b/src/mlpack/tests/to_string_test.cpp @@ -151,8 +151,8 @@ BOOST_AUTO_TEST_CASE(PolynomialKernelString) BOOST_AUTO_TEST_CASE(PSpectrumStringKernelString) { const std::vector > s; - const size_t t=1; - PSpectrumStringKernel d(s,t); + const size_t t = 1; + PSpectrumStringKernel d(s, t); Log::Debug << d; std::string sttm = d.ToString(); BOOST_REQUIRE_NE(sttm, ""); @@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE(SGDString) const arma::mat g(2, 2); const arma::Col v(2); SoftmaxErrorFunction<> a(g, v); - mlpack::optimization::SGD > d(a); + mlpack::optimization::SGD > d(a); Log::Debug << d; std::string s = d.ToString(); BOOST_REQUIRE_NE(s, ""); @@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE(L_BFGSString) const arma::mat g(2, 2); const arma::Col v(2); SoftmaxErrorFunction<> a(g, v); - mlpack::optimization::L_BFGS > d(a); + mlpack::optimization::L_BFGS > d(a); Log::Debug << d; std::string s = d.ToString(); BOOST_REQUIRE_NE(s, ""); @@ -222,11 +222,9 @@ BOOST_AUTO_TEST_CASE(L_BFGSString) BOOST_AUTO_TEST_CASE(AugLagString) { - mlpack::optimization::AugLagrangianTestFunction a; - mlpack::optimization::AugLagrangianFunction - q(a); - mlpack::optimization::AugLagrangian - d(a); + mlpack::optimization::AugLagrangianTestFunction a; + mlpack::optimization::AugLagrangian< + mlpack::optimization::AugLagrangianTestFunction> d(a); Log::Debug << d; std::string s = d.ToString(); BOOST_REQUIRE_NE(s, ""); @@ -234,7 +232,7 @@ BOOST_AUTO_TEST_CASE(AugLagString) BOOST_AUTO_TEST_CASE(BallBoundString) { - BallBound<> d; + BallBound<> d(3.5, "1.0 2.0"); Log::Debug << d; std::string s = d.ToString(); BOOST_REQUIRE_NE(s, ""); @@ -242,7 +240,7 @@ BOOST_AUTO_TEST_CASE(BallBoundString) BOOST_AUTO_TEST_CASE(BinSpaceString) { - arma::mat q(2, 2); + arma::mat q(2, 50); q.randu(); BinarySpaceTree > d(q); Log::Debug << d;