From b2bf7f376440bd4f55ceb6f710589eb098eabefc Mon Sep 17 00:00:00 2001 From: NippunSharma Date: Sun, 15 Nov 2020 22:07:17 +0530 Subject: [PATCH] Added requested changes --- src/mlpack/tests/akfn_test.cpp | 4 ++-- src/mlpack/tests/aknn_test.cpp | 4 ++-- src/mlpack/tests/callback_test.cpp | 8 ++++---- src/mlpack/tests/cf_test.cpp | 8 ++++---- src/mlpack/tests/decision_tree_test.cpp | 24 ++++++++++++------------ src/mlpack/tests/facilities_test.cpp | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/mlpack/tests/akfn_test.cpp b/src/mlpack/tests/akfn_test.cpp index f9cb8faf67..a5f802cd7e 100644 --- a/src/mlpack/tests/akfn_test.cpp +++ b/src/mlpack/tests/akfn_test.cpp @@ -167,7 +167,7 @@ TEST_CASE("AKFNDualCoverTreeTest", "[AKFNTest]") { arma::mat dataset; if (!data::Load("test_data_3_1000.csv", dataset)) - FAIL("Unable to load data test_data_3_1000.csv!"); + FAIL("Cannot load test dataset test_data_3_1000.csv!"); KFN exact(dataset); arma::Mat neighborsExact; @@ -225,7 +225,7 @@ TEST_CASE("AKFNDualBallTreeTest", "[AKFNTest]") { arma::mat dataset; if (!data::Load("test_data_3_1000.csv", dataset)) - FAIL("Unable to load data test_data_3_1000.csv!"); + FAIL("Cannot load test dataset test_data_3_1000.csv!"); KFN exact(dataset); arma::Mat neighborsExact; diff --git a/src/mlpack/tests/aknn_test.cpp b/src/mlpack/tests/aknn_test.cpp index b336f79105..37b5e820da 100644 --- a/src/mlpack/tests/aknn_test.cpp +++ b/src/mlpack/tests/aknn_test.cpp @@ -170,7 +170,7 @@ TEST_CASE("AKNNDualCoverTreeTest", "[AKNNTest]") { arma::mat dataset; if (!data::Load("test_data_3_1000.csv", dataset)) - FAIL("Unable to load data test_data_3_1000.csv!"); + FAIL("Cannot load test dataset test_data_3_1000.csv!"); KNN exact(dataset); arma::Mat neighborsExact; @@ -225,7 +225,7 @@ TEST_CASE("AKNNDualBallTreeTest", "[AKNNTest]") { arma::mat dataset; if (!data::Load("test_data_3_1000.csv", dataset)) - FAIL("Unable to load data test_data_3_1000.csv!"); + FAIL("Cannot load test dataset test_data_3_1000.csv!"); KNN exact(dataset); arma::Mat neighborsExact; diff --git a/src/mlpack/tests/callback_test.cpp b/src/mlpack/tests/callback_test.cpp index 902b435d37..e66fc1e051 100644 --- a/src/mlpack/tests/callback_test.cpp +++ b/src/mlpack/tests/callback_test.cpp @@ -43,9 +43,9 @@ TEST_CASE("FFNCallbackTest", "[CallbackTest]") arma::mat labels; if (!data::Load("lab1.csv", data, true)) - FAIL("Unable to load data lab1.csv!"); + FAIL("Cannot load test dataset lab1.csv!"); if (!data::Load("lab3.csv", labels, true)) - FAIL("Unable to load data lab3.csv!"); + FAIL("Cannot load test dataset lab3.csv!"); FFN, RandomInitialization> model; @@ -69,9 +69,9 @@ TEST_CASE("FFNWithOptimizerCallbackTest", "[CallbackTest]") arma::mat labels; if (!data::Load("lab1.csv", data, true)) - FAIL("Unable to load data lab1.csv!"); + FAIL("Cannot load test dataset lab1.csv!"); if (!data::Load("lab3.csv", labels, true)) - FAIL("Unable to load data lab3.csv!"); + FAIL("Cannot load test dataset lab3.csv!"); FFN, RandomInitialization> model; diff --git a/src/mlpack/tests/cf_test.cpp b/src/mlpack/tests/cf_test.cpp index 260baa634d..735fe65c20 100644 --- a/src/mlpack/tests/cf_test.cpp +++ b/src/mlpack/tests/cf_test.cpp @@ -47,7 +47,7 @@ using namespace std; static void GetDatasets(arma::mat& dataset, arma::mat& savedCols) { if (!data::Load("GroupLensSmall.csv", dataset)) - FAIL("Unable to load data GroupLensSmall.csv!"); + FAIL("Cannot load test dataset GroupLensSmall.csv!"); savedCols.set_size(3, 50); // Save the columns we've removed. @@ -103,7 +103,7 @@ void GetRecommendationsAllUsers() // Load GroupLens data. arma::mat dataset; if (!data::Load("GroupLensSmall.csv", dataset)) - FAIL("Unable to load data GroupLensSamll.csv!"); + FAIL("Cannot load test dataset GroupLensSamll.csv!"); CFType c(dataset, decomposition, 5, 5, 30); @@ -141,7 +141,7 @@ void GetRecommendationsQueriedUser() // Load GroupLens data. arma::mat dataset; if (!data::Load("GroupLensSmall.csv", dataset)) - FAIL("Unable to load data GroupLensSmall.csv!"); + FAIL("Cannot load test dataset GroupLensSmall.csv!"); CFType c(dataset, decomposition, 5, 5, 30); @@ -431,7 +431,7 @@ void Serialization() // Load a dataset to train on. arma::mat dataset; if (!data::Load("GroupLensSmall.csv", dataset)) - FAIL("Unable to load data GroupLensSmall.csv!"); + FAIL("Cannot load test dataset GroupLensSmall.csv!"); arma::sp_mat cleanedData; CFType labels; if (!data::Load("vc2.csv", dataset)) - FAIL("Unable to load data vc2.csv!"); + FAIL("Cannot load test dataset vc2.csv!"); if (!data::Load("vc2_labels.txt", labels)) - FAIL("Unable to load data vc2_labels.txt!"); + FAIL("Cannot load labels for vc2_labels.txt!"); // Add some noise. arma::mat noise(dataset.n_rows, 1000, arma::fill::randu); @@ -833,9 +833,9 @@ TEST_CASE("WeightedDecisionTreeTest", "[DecisionTreeTest]") arma::mat testData; arma::Row testLabels; if (!data::Load("vc2_test.csv", testData)) - FAIL("Unable to load data vc2_test.csv!"); + FAIL("Cannot load test dataset vc2_test.csv!"); if (!data::Load("vc2_test_labels.txt", testLabels)) - FAIL("Unable to load data vc2_test_labels.txt!"); + FAIL("Cannot load labels for vc2_test_labels.txt!"); arma::Row predictions; d.Classify(testData, predictions); @@ -918,9 +918,9 @@ TEST_CASE("WeightedDecisionTreeInformationGainTest", "[DecisionTreeTest]") arma::mat dataset; arma::Row labels; if (!data::Load("vc2.csv", dataset)) - FAIL("Unable to load data vc2.csv!"); + FAIL("Cannot load test dataset vc2.csv!"); if (!data::Load("vc2_labels.txt", labels)) - FAIL("Unable to load vc2_labels.txt!"); + FAIL("Cannot load labels for vc2_labels.txt!"); // Add some noise. arma::mat noise(dataset.n_rows, 1000, arma::fill::randu); @@ -946,9 +946,9 @@ TEST_CASE("WeightedDecisionTreeInformationGainTest", "[DecisionTreeTest]") arma::mat testData; arma::Row testLabels; if (!data::Load("vc2_test.csv", testData)) - FAIL("Unable to load data vc2_test.csv!"); + FAIL("Cannot load test dataset vc2_test.csv!"); if (!data::Load("vc2_test_labels.txt", testLabels)) - FAIL("Unable to load data vc2_test_labels.txt!"); + FAIL("Cannot load labels for vc2_test_labels.txt!"); arma::Row predictions; d.Classify(testData, predictions); @@ -1108,9 +1108,9 @@ TEST_CASE("NumClassesTest", "[DecisionTreeTest]") arma::mat dataset; arma::Row labels; if (!data::Load("vc2.csv", dataset)) - FAIL("Unable to load data vc2.csv!"); + FAIL("Cannot load test dataset vc2.csv!"); if (!data::Load("vc2_labels.txt", labels)) - FAIL("Unable to load data vc2_labels.txt!"); + FAIL("Cannot load labels for vc2_labels.txt!"); DecisionTree<> dt(dataset, labels, 3); @@ -1240,9 +1240,9 @@ TEST_CASE("DifferentMaximumDepthTest", "[DecisionTreeTest]") arma::mat dataset; arma::Row labels; if (!data::Load("vc2.csv", dataset)) - FAIL("Unable to load data vc2.csv!"); + FAIL("Cannot load test dataset vc2.csv!"); if (!data::Load("vc2_labels.txt", labels)) - FAIL("Unable to load data vc2_labels.txt!"); + FAIL("Cannot load labels for vc2_labels.txt!"); DecisionTree<> d(dataset, labels, 3, 10, 1e-7, 1); diff --git a/src/mlpack/tests/facilities_test.cpp b/src/mlpack/tests/facilities_test.cpp index 66642d3cd3..7cf1507048 100644 --- a/src/mlpack/tests/facilities_test.cpp +++ b/src/mlpack/tests/facilities_test.cpp @@ -28,11 +28,11 @@ TEST_CASE("AssertSizesTest", "[FacilitiesTest]") // Load the dataset. arma::mat dataset; if (!data::Load("iris_train.csv", dataset)) - FAIL("Unable to load data iris_train.csv!"); + FAIL("Cannot load test dataset iris_train.csv!"); // Load the labels. arma::Row labels; if (!data::Load("iris_test_labels.csv", labels)) - FAIL("Unable to load data iris_test_labels.csv!"); + FAIL("Cannot load test dataset iris_test_labels.csv!"); REQUIRE_THROWS_AS( AssertSizes(dataset, labels, "test"), std::invalid_argument);