Added requested changes

This commit is contained in:
NippunSharma
2020-11-15 22:07:17 +05:30
parent 178dd4fc30
commit b2bf7f3764
6 changed files with 26 additions and 26 deletions
+2 -2
View File
@@ -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<size_t> 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<size_t> neighborsExact;
+2 -2
View File
@@ -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<size_t> 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<size_t> neighborsExact;
+4 -4
View File
@@ -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<MeanSquaredError<>, 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<MeanSquaredError<>, RandomInitialization> model;
+4 -4
View File
@@ -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<DecompositionPolicy> 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<DecompositionPolicy> 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<DecompositionPolicy,
+12 -12
View File
@@ -805,9 +805,9 @@ TEST_CASE("WeightedDecisionTreeTest", "[DecisionTreeTest]")
arma::mat dataset;
arma::Row<size_t> 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<size_t> 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<size_t> predictions;
d.Classify(testData, predictions);
@@ -918,9 +918,9 @@ TEST_CASE("WeightedDecisionTreeInformationGainTest", "[DecisionTreeTest]")
arma::mat dataset;
arma::Row<size_t> 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<size_t> 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<size_t> predictions;
d.Classify(testData, predictions);
@@ -1108,9 +1108,9 @@ TEST_CASE("NumClassesTest", "[DecisionTreeTest]")
arma::mat dataset;
arma::Row<size_t> 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<size_t> 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);
+2 -2
View File
@@ -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<size_t> 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);