From 555b8c6a6f4ba620f4e4b2bb3306f17bedff5af9 Mon Sep 17 00:00:00 2001 From: jeffin143 Date: Tue, 21 Jul 2020 00:27:10 +0530 Subject: [PATCH] Change 1e-5 / 100 to 1e-7 --- src/mlpack/tests/binarize_test.cpp | 28 +++++++++---------- .../main_tests/preprocess_binarize_test.cpp | 22 +++++++-------- .../main_tests/preprocess_split_test.cpp | 3 +- src/mlpack/tests/scaling_test.cpp | 4 +-- src/mlpack/tests/split_data_test.cpp | 4 +-- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/mlpack/tests/binarize_test.cpp b/src/mlpack/tests/binarize_test.cpp index e45781752c..9d1a1c6d39 100644 --- a/src/mlpack/tests/binarize_test.cpp +++ b/src/mlpack/tests/binarize_test.cpp @@ -32,15 +32,15 @@ TEST_CASE("BinerizeOneDimension", "[BinarizeTest]") const size_t dimension = 1; Binarize(input, output, threshold, dimension); - REQUIRE(output(0, 0)== Approx(1.0).epsilon(1e-5 / 100)); // 1 - REQUIRE(output(0, 1)== Approx(2.0).epsilon(1e-5 / 100)); // 2 - REQUIRE(output(0, 2)== Approx(3.0).epsilon(1e-5 / 100)); // 3 + REQUIRE(output(0, 0)== Approx(1.0).epsilon(1e-7)); // 1 + REQUIRE(output(0, 1)== Approx(2.0).epsilon(1e-7)); // 2 + REQUIRE(output(0, 2)== Approx(3.0).epsilon(1e-7)); // 3 REQUIRE(output(1, 0) == Approx(0.0).margin(1e-5)); // 4 target REQUIRE(output(1, 1) == Approx(0.0).margin(1e-5)); // 5 target - REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-5 / 100)); // 6 target - REQUIRE(output(2, 0)== Approx(7.0).epsilon(1e-5 / 100)); // 7 - REQUIRE(output(2, 1)== Approx(8.0).epsilon(1e-5 / 100)); // 8 - REQUIRE(output(2, 2)== Approx(9.0).epsilon(1e-5 / 100)); // 9 + REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-7)); // 6 target + REQUIRE(output(2, 0)== Approx(7.0).epsilon(1e-7)); // 7 + REQUIRE(output(2, 1)== Approx(8.0).epsilon(1e-7)); // 8 + REQUIRE(output(2, 2)== Approx(9.0).epsilon(1e-7)); // 9 } TEST_CASE("BinerizeAll", "[BinarizeTest]") @@ -57,11 +57,11 @@ TEST_CASE("BinerizeAll", "[BinarizeTest]") REQUIRE(output(0, 0) == Approx(0.0).margin(1e-5)); // 1 REQUIRE(output(0, 1) == Approx(0.0).margin(1e-5)); // 2 - REQUIRE(output(0, 2) == Approx(0.0).margin(1e-5)); // 3 - REQUIRE(output(1, 0) == Approx(0.0).margin(1e-5)); //4 + REQUIRE(output(0, 2) == Approx(0.0).margin(1e-5)); // 3 + REQUIRE(output(1, 0) == Approx(0.0).margin(1e-5)); // 4 REQUIRE(output(1, 1) == Approx(0.0).margin(1e-5)); // 5 - REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-5 / 100)); // 6 - REQUIRE(output(2, 0)== Approx(1.0).epsilon(1e-5 / 100)); // 7 - REQUIRE(output(2, 1)== Approx(1.0).epsilon(1e-5 / 100)); // 8 - REQUIRE(output(2, 2)== Approx(1.0).epsilon(1e-5 / 100)); // 9 - } + REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-7)); // 6 + REQUIRE(output(2, 0)== Approx(1.0).epsilon(1e-7)); // 7 + REQUIRE(output(2, 1)== Approx(1.0).epsilon(1e-7)); // 8 + REQUIRE(output(2, 2)== Approx(1.0).epsilon(1e-7)); // 9 +} diff --git a/src/mlpack/tests/main_tests/preprocess_binarize_test.cpp b/src/mlpack/tests/main_tests/preprocess_binarize_test.cpp index e1e9d38860..e56027e859 100644 --- a/src/mlpack/tests/main_tests/preprocess_binarize_test.cpp +++ b/src/mlpack/tests/main_tests/preprocess_binarize_test.cpp @@ -120,19 +120,19 @@ TEST_CASE_METHOD( output = std::move(IO::GetParam("output")); // All values dimension should remain unchanged. - REQUIRE(output(0, 0)== Approx(7.0).epsilon(1e-5 / 100)); - REQUIRE(output(0, 1)== Approx(4.0).epsilon(1e-5 / 100)); - REQUIRE(output(0, 2)== Approx(5.0).epsilon(1e-5 / 100)); + REQUIRE(output(0, 0)== Approx(7.0).epsilon(1e-7)); + REQUIRE(output(0, 1)== Approx(4.0).epsilon(1e-7)); + REQUIRE(output(0, 2)== Approx(5.0).epsilon(1e-7)); // All values should be binarized according to the threshold. REQUIRE(output(1, 0) == Approx(0.0).margin(1e-5)); REQUIRE(output(1, 1) == Approx(0.0).margin(1e-5)); - REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-5 / 100)); + REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-7)); // All values dimension should remain unchanged. - REQUIRE(output(2, 0)== Approx(7.0).epsilon(1e-5 / 100)); - REQUIRE(output(2, 1)== Approx(3.0).epsilon(1e-5 / 100)); - REQUIRE(output(2, 2)== Approx(8.0).epsilon(1e-5 / 100)); + REQUIRE(output(2, 0)== Approx(7.0).epsilon(1e-7)); + REQUIRE(output(2, 1)== Approx(3.0).epsilon(1e-7)); + REQUIRE(output(2, 2)== Approx(8.0).epsilon(1e-7)); } /** @@ -153,13 +153,13 @@ TEST_CASE_METHOD( output = std::move(IO::GetParam("output")); // All values should be binarized according to the threshold. - REQUIRE(output(0, 0)== Approx(1.0).epsilon(1e-5 / 100)); + REQUIRE(output(0, 0)== Approx(1.0).epsilon(1e-7)); REQUIRE(output(0, 1) == Approx(0.0).margin(1e-5)); REQUIRE(output(0, 2) == Approx(0.0).margin(1e-5)); REQUIRE(output(1, 0) == Approx(0.0).margin(1e-5)); REQUIRE(output(1, 1) == Approx(0.0).margin(1e-5)); - REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-5 / 100)); - REQUIRE(output(2, 0)== Approx(1.0).epsilon(1e-5 / 100)); + REQUIRE(output(1, 2)== Approx(1.0).epsilon(1e-7)); + REQUIRE(output(2, 0)== Approx(1.0).epsilon(1e-7)); REQUIRE(output(2, 1) == Approx(0.0).margin(1e-5)); - REQUIRE(output(2, 2)== Approx(1.0).epsilon(1e-5 / 100)); + REQUIRE(output(2, 2)== Approx(1.0).epsilon(1e-7)); } diff --git a/src/mlpack/tests/main_tests/preprocess_split_test.cpp b/src/mlpack/tests/main_tests/preprocess_split_test.cpp index 375af31f6e..e6fb7fab05 100644 --- a/src/mlpack/tests/main_tests/preprocess_split_test.cpp +++ b/src/mlpack/tests/main_tests/preprocess_split_test.cpp @@ -163,7 +163,8 @@ TEST_CASE_METHOD( REQUIRE(IO::GetParam("training").n_cols == inputSize); REQUIRE(IO::GetParam("test").n_cols == 0); - REQUIRE(IO::GetParam>("training_labels").n_cols == labelSize); + REQUIRE(IO::GetParam>("training_labels").n_cols == + labelSize); REQUIRE(IO::GetParam>("test_labels").n_cols == 0); } diff --git a/src/mlpack/tests/scaling_test.cpp b/src/mlpack/tests/scaling_test.cpp index dd3f425556..432d39e650 100644 --- a/src/mlpack/tests/scaling_test.cpp +++ b/src/mlpack/tests/scaling_test.cpp @@ -149,7 +149,7 @@ TEST_CASE("PCAWhiteningTest", "[ScalingTest]") double ccovsum = 0.0; for (size_t i = 0; i < diagonals.n_elem; ++i) ccovsum += diagonals(i); - REQUIRE(ccovsum == Approx(1.0).epsilon(1e-3 / 100)); + REQUIRE(ccovsum == Approx(1.0).epsilon(1e-5)); scale.InverseTransform(output, temp); CheckMatrices(dataset, temp); } @@ -168,7 +168,7 @@ TEST_CASE("ZCAWhiteningTest", "[ScalingTest]") double ccovsum = 0.0; for (size_t i = 0; i < diagonals.n_elem; ++i) ccovsum += diagonals(i); - REQUIRE(ccovsum == Approx(1.0).epsilon(1e-3 / 100)); + REQUIRE(ccovsum == Approx(1.0).epsilon(1e-5)); scale.InverseTransform(output, temp); CheckMatrices(dataset, temp); } diff --git a/src/mlpack/tests/split_data_test.cpp b/src/mlpack/tests/split_data_test.cpp index 788e80e372..6e61fe07bd 100644 --- a/src/mlpack/tests/split_data_test.cpp +++ b/src/mlpack/tests/split_data_test.cpp @@ -42,7 +42,7 @@ void CompareData(const mat& inputData, if (std::abs(rhsCol(j)) < 1e-5) REQUIRE(lhsCol(j) == Approx(0.0).margin(1e-5)); else - REQUIRE(lhsCol(j) == Approx(rhsCol(j)).epsilon(1e-5 / 100)); + REQUIRE(lhsCol(j) == Approx(rhsCol(j)).epsilon(1e-7)); } } } @@ -61,7 +61,7 @@ void CheckMatEqual(const mat& inputData, if (std::abs(rhsCol(j)) < 1e-5) REQUIRE(lhsCol(j) == Approx(0.0).margin(1e-5)); else - REQUIRE(lhsCol(j) == Approx(rhsCol(j)).epsilon(1e-5 / 100)); + REQUIRE(lhsCol(j) == Approx(rhsCol(j)).epsilon(1e-7)); } } }