From 47628d753dc5eec4233f8bcd352e77ce22393df8 Mon Sep 17 00:00:00 2001 From: Anush V Kini Date: Fri, 4 Dec 2020 15:06:32 +0530 Subject: [PATCH 1/2] Added fail messages and comment fix --- src/mlpack/tests/callback_test.cpp | 8 ++++---- src/mlpack/tests/svd_batch_test.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mlpack/tests/callback_test.cpp b/src/mlpack/tests/callback_test.cpp index e66fc1e051..0d532df67c 100644 --- a/src/mlpack/tests/callback_test.cpp +++ b/src/mlpack/tests/callback_test.cpp @@ -42,9 +42,9 @@ TEST_CASE("FFNCallbackTest", "[CallbackTest]") arma::mat data; arma::mat labels; - if (!data::Load("lab1.csv", data, true)) + if (!data::Load("lab1.csv", data)) FAIL("Cannot load test dataset lab1.csv!"); - if (!data::Load("lab3.csv", labels, true)) + if (!data::Load("lab3.csv", labels)) FAIL("Cannot load test dataset lab3.csv!"); FFN, RandomInitialization> model; @@ -68,9 +68,9 @@ TEST_CASE("FFNWithOptimizerCallbackTest", "[CallbackTest]") arma::mat data; arma::mat labels; - if (!data::Load("lab1.csv", data, true)) + if (!data::Load("lab1.csv", data)) FAIL("Cannot load test dataset lab1.csv!"); - if (!data::Load("lab3.csv", labels, true)) + if (!data::Load("lab3.csv", labels)) FAIL("Cannot load test dataset lab3.csv!"); FFN, RandomInitialization> model; diff --git a/src/mlpack/tests/svd_batch_test.cpp b/src/mlpack/tests/svd_batch_test.cpp index bac6df4917..ab9eb99f5a 100644 --- a/src/mlpack/tests/svd_batch_test.cpp +++ b/src/mlpack/tests/svd_batch_test.cpp @@ -70,7 +70,8 @@ class SpecificRandomInitialization TEST_CASE("SVDBatchMomentumTest", "[SVDBatchTest]") { mat dataset; - data::Load("GroupLensSmall.csv", dataset); + if (data::Load("GroupLensSmall.csv", dataset)) + FAIL("Cannot load dataset GroupLensSmall.csv!"); // Generate list of locations for batch insert constructor for sparse // matrices. @@ -117,7 +118,8 @@ TEST_CASE("SVDBatchMomentumTest", "[SVDBatchTest]") TEST_CASE("SVDBatchRegularizationTest", "[SVDBatchTest]") { mat dataset; - data::Load("GroupLensSmall.csv", dataset); + if (data::Load("GroupLensSmall.csv", dataset)) + FAIL("Cannot load dataset GroupLensSmall.csv!"); // Generate list of locations for batch insert constructor for sparse // matrices. From 6cad509c2fe31c4239f111165c4e8f23b06fb697 Mon Sep 17 00:00:00 2001 From: Anush V Kini Date: Fri, 4 Dec 2020 16:04:58 +0530 Subject: [PATCH 2/2] Minor fix --- src/mlpack/tests/svd_batch_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mlpack/tests/svd_batch_test.cpp b/src/mlpack/tests/svd_batch_test.cpp index ab9eb99f5a..41b005a28d 100644 --- a/src/mlpack/tests/svd_batch_test.cpp +++ b/src/mlpack/tests/svd_batch_test.cpp @@ -70,7 +70,7 @@ class SpecificRandomInitialization TEST_CASE("SVDBatchMomentumTest", "[SVDBatchTest]") { mat dataset; - if (data::Load("GroupLensSmall.csv", dataset)) + if (!data::Load("GroupLensSmall.csv", dataset)) FAIL("Cannot load dataset GroupLensSmall.csv!"); // Generate list of locations for batch insert constructor for sparse @@ -118,7 +118,7 @@ TEST_CASE("SVDBatchMomentumTest", "[SVDBatchTest]") TEST_CASE("SVDBatchRegularizationTest", "[SVDBatchTest]") { mat dataset; - if (data::Load("GroupLensSmall.csv", dataset)) + if (!data::Load("GroupLensSmall.csv", dataset)) FAIL("Cannot load dataset GroupLensSmall.csv!"); // Generate list of locations for batch insert constructor for sparse