diff options
Diffstat (limited to 'src/Persistence_representations/test/persistence_intervals_test.cpp')
| -rw-r--r-- | src/Persistence_representations/test/persistence_intervals_test.cpp | 231 |
1 files changed, 110 insertions, 121 deletions
diff --git a/src/Persistence_representations/test/persistence_intervals_test.cpp b/src/Persistence_representations/test/persistence_intervals_test.cpp index 545330c4..f555e243 100644 --- a/src/Persistence_representations/test/persistence_intervals_test.cpp +++ b/src/Persistence_representations/test/persistence_intervals_test.cpp @@ -25,25 +25,20 @@ #include <boost/test/unit_test.hpp> #include <gudhi/reader_utils.h> #include "gudhi/Persistence_intervals.h" +#include <gudhi/common_persistence_representations.h> +#include <gudhi/Unitary_tests_utils.h> #include <iostream> using namespace Gudhi; using namespace Gudhi::Persistence_representations; -double epsilon = 0.0000005; - -// cout << "Left most end of the interval : " << min_max_.first << std::endl; -// cout << "Right most end of the interval : " << min_max_.second << std::endl; BOOST_AUTO_TEST_CASE(check_min_max_function) { - std::cerr << "First test \n"; Persistence_intervals p("data/file_with_diagram"); std::pair<double, double> min_max_ = p.get_x_range(); - // cout << min_max_.first << " " << min_max_.second << std::endl;getchar(); - - BOOST_CHECK(fabs(min_max_.first - 0.0290362) <= epsilon); - BOOST_CHECK(fabs(min_max_.second - 0.994537) <= epsilon); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(min_max_.first, 0.0290362, Gudhi::Persistence_representations::epsi); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(min_max_.second, 0.994537, Gudhi::Persistence_representations::epsi); } BOOST_AUTO_TEST_CASE(check_length_of_dominant_intervals) { @@ -61,7 +56,8 @@ BOOST_AUTO_TEST_CASE(check_length_of_dominant_intervals) { dominant_intervals_length.push_back(0.700468); dominant_intervals_length.push_back(0.622177); for (size_t i = 0; i != dominant_ten_intervals_length.size(); ++i) { - BOOST_CHECK(fabs(dominant_ten_intervals_length[i] - dominant_intervals_length[i]) <= epsilon); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(dominant_ten_intervals_length[i], dominant_intervals_length[i], + Gudhi::Persistence_representations::epsi); } } BOOST_AUTO_TEST_CASE(check_dominant_intervals) { @@ -81,8 +77,10 @@ BOOST_AUTO_TEST_CASE(check_dominant_intervals) { templ.push_back(std::pair<double, double>(0.267421, 0.889597)); for (size_t i = 0; i != ten_dominant_intervals.size(); ++i) { - BOOST_CHECK(fabs(ten_dominant_intervals[i].first - templ[i].first) <= epsilon); - BOOST_CHECK(fabs(ten_dominant_intervals[i].second - templ[i].second) <= epsilon); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(ten_dominant_intervals[i].first, templ[i].first, + Gudhi::Persistence_representations::epsi); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(ten_dominant_intervals[i].second, templ[i].second, + Gudhi::Persistence_representations::epsi); } } @@ -102,7 +100,7 @@ BOOST_AUTO_TEST_CASE(check_histogram_of_lengths) { template_histogram.push_back(1); template_histogram.push_back(1); for (size_t i = 0; i != histogram.size(); ++i) { - BOOST_CHECK(fabs(histogram[i] - template_histogram[i]) <= epsilon); + BOOST_CHECK(histogram[i] == template_histogram[i]); } } @@ -123,7 +121,7 @@ BOOST_AUTO_TEST_CASE(check_cumulative_histograms_of_lengths) { template_cumulative_histogram.push_back(45); for (size_t i = 0; i != cumulative_histogram.size(); ++i) { - BOOST_CHECK(fabs(cumulative_histogram[i] - template_cumulative_histogram[i]) <= epsilon); + BOOST_CHECK(cumulative_histogram[i] == template_cumulative_histogram[i]); } } BOOST_AUTO_TEST_CASE(check_characteristic_function_of_diagram) { @@ -143,15 +141,8 @@ BOOST_AUTO_TEST_CASE(check_characteristic_function_of_diagram) { template_char_funct_diag.push_back(0.0676303); for (size_t i = 0; i != char_funct_diag.size(); ++i) { - // cout << char_funct_diag[i] << std::endl; - if (fabs(char_funct_diag[i] - template_char_funct_diag[i]) >= 0.0001) { - std::cout << "Boost test fail check_characteristic_function_of_diagram : " << std::endl; - std::cerr << char_funct_diag[i] << " " << template_char_funct_diag[i] << std::endl; - std::cerr << fabs(char_funct_diag[i] - template_char_funct_diag[i]) << std::endl; - std::cerr << 0.0001 << std::endl; - //getchar(); - } - BOOST_CHECK(fabs(char_funct_diag[i] - template_char_funct_diag[i]) <= 0.0001); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(char_funct_diag[i], template_char_funct_diag[i], + Gudhi::Persistence_representations::epsi); } } @@ -174,110 +165,109 @@ BOOST_AUTO_TEST_CASE(check_cumulative_characteristic_function_of_diagram) { template_char_funct_diag_cumul.push_back(9.48386); for (size_t i = 0; i != cumul_char_funct_diag.size(); ++i) { - // cout << cumul_char_funct_diag[i] << std::endl; - BOOST_CHECK(fabs(cumul_char_funct_diag[i] - template_char_funct_diag_cumul[i]) <= 0.0001); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(cumul_char_funct_diag[i], template_char_funct_diag_cumul[i], + Gudhi::Persistence_representations::epsi); } } BOOST_AUTO_TEST_CASE(check_compute_persistent_betti_numbers) { Persistence_intervals p("data/file_with_diagram"); - std::vector<std::pair<double, double> > pbns; - pbns.push_back(std::pair<double, double>(0.0290362, 1)); - pbns.push_back(std::pair<double, double>(0.0307676, 2)); - pbns.push_back(std::pair<double, double>(0.0366312, 3)); - pbns.push_back(std::pair<double, double>(0.0544614, 4)); - pbns.push_back(std::pair<double, double>(0.0920033, 5)); - pbns.push_back(std::pair<double, double>(0.104599, 6)); - pbns.push_back(std::pair<double, double>(0.114718, 7)); - pbns.push_back(std::pair<double, double>(0.117379, 8)); - pbns.push_back(std::pair<double, double>(0.123493, 9)); - pbns.push_back(std::pair<double, double>(0.133638, 10)); - pbns.push_back(std::pair<double, double>(0.137798, 9)); - pbns.push_back(std::pair<double, double>(0.149798, 10)); - pbns.push_back(std::pair<double, double>(0.155421, 11)); - pbns.push_back(std::pair<double, double>(0.158443, 12)); - pbns.push_back(std::pair<double, double>(0.176956, 13)); - pbns.push_back(std::pair<double, double>(0.183234, 12)); - pbns.push_back(std::pair<double, double>(0.191069, 13)); - pbns.push_back(std::pair<double, double>(0.191333, 14)); - pbns.push_back(std::pair<double, double>(0.191836, 15)); - pbns.push_back(std::pair<double, double>(0.192675, 16)); - pbns.push_back(std::pair<double, double>(0.208564, 17)); - pbns.push_back(std::pair<double, double>(0.218425, 18)); - pbns.push_back(std::pair<double, double>(0.219902, 17)); - pbns.push_back(std::pair<double, double>(0.23233, 16)); - pbns.push_back(std::pair<double, double>(0.234558, 17)); - pbns.push_back(std::pair<double, double>(0.237166, 16)); - pbns.push_back(std::pair<double, double>(0.247352, 17)); - pbns.push_back(std::pair<double, double>(0.267421, 18)); - pbns.push_back(std::pair<double, double>(0.268093, 19)); - pbns.push_back(std::pair<double, double>(0.278734, 18)); - pbns.push_back(std::pair<double, double>(0.284722, 19)); - pbns.push_back(std::pair<double, double>(0.284998, 20)); - pbns.push_back(std::pair<double, double>(0.294069, 21)); - pbns.push_back(std::pair<double, double>(0.306293, 22)); - pbns.push_back(std::pair<double, double>(0.322361, 21)); - pbns.push_back(std::pair<double, double>(0.323152, 22)); - pbns.push_back(std::pair<double, double>(0.371021, 23)); - pbns.push_back(std::pair<double, double>(0.372395, 24)); - pbns.push_back(std::pair<double, double>(0.387744, 25)); - pbns.push_back(std::pair<double, double>(0.435537, 26)); - pbns.push_back(std::pair<double, double>(0.462911, 25)); - pbns.push_back(std::pair<double, double>(0.483569, 26)); - pbns.push_back(std::pair<double, double>(0.489209, 25)); - pbns.push_back(std::pair<double, double>(0.517115, 24)); - pbns.push_back(std::pair<double, double>(0.522197, 23)); - pbns.push_back(std::pair<double, double>(0.532665, 22)); - pbns.push_back(std::pair<double, double>(0.545262, 23)); - pbns.push_back(std::pair<double, double>(0.587227, 22)); - pbns.push_back(std::pair<double, double>(0.593036, 23)); - pbns.push_back(std::pair<double, double>(0.602647, 24)); - pbns.push_back(std::pair<double, double>(0.605044, 25)); - pbns.push_back(std::pair<double, double>(0.621962, 24)); - pbns.push_back(std::pair<double, double>(0.629449, 23)); - pbns.push_back(std::pair<double, double>(0.636719, 22)); - pbns.push_back(std::pair<double, double>(0.64957, 21)); - pbns.push_back(std::pair<double, double>(0.650781, 22)); - pbns.push_back(std::pair<double, double>(0.654951, 23)); - pbns.push_back(std::pair<double, double>(0.683489, 24)); - pbns.push_back(std::pair<double, double>(0.687172, 23)); - pbns.push_back(std::pair<double, double>(0.69703, 22)); - pbns.push_back(std::pair<double, double>(0.701174, 21)); - pbns.push_back(std::pair<double, double>(0.717623, 22)); - pbns.push_back(std::pair<double, double>(0.722023, 21)); - pbns.push_back(std::pair<double, double>(0.722298, 20)); - pbns.push_back(std::pair<double, double>(0.725347, 19)); - pbns.push_back(std::pair<double, double>(0.73071, 18)); - pbns.push_back(std::pair<double, double>(0.758355, 17)); - pbns.push_back(std::pair<double, double>(0.770913, 18)); - pbns.push_back(std::pair<double, double>(0.790833, 17)); - pbns.push_back(std::pair<double, double>(0.821211, 16)); - pbns.push_back(std::pair<double, double>(0.849305, 17)); - pbns.push_back(std::pair<double, double>(0.853669, 16)); - pbns.push_back(std::pair<double, double>(0.866659, 15)); - pbns.push_back(std::pair<double, double>(0.872896, 16)); - pbns.push_back(std::pair<double, double>(0.889597, 15)); - pbns.push_back(std::pair<double, double>(0.900231, 14)); - pbns.push_back(std::pair<double, double>(0.903847, 13)); - pbns.push_back(std::pair<double, double>(0.906299, 12)); - pbns.push_back(std::pair<double, double>(0.910852, 11)); - pbns.push_back(std::pair<double, double>(0.93453, 10)); - pbns.push_back(std::pair<double, double>(0.944757, 9)); - pbns.push_back(std::pair<double, double>(0.947812, 8)); - pbns.push_back(std::pair<double, double>(0.959154, 7)); - pbns.push_back(std::pair<double, double>(0.975654, 6)); - pbns.push_back(std::pair<double, double>(0.976719, 5)); - pbns.push_back(std::pair<double, double>(0.977343, 4)); - pbns.push_back(std::pair<double, double>(0.980129, 3)); - pbns.push_back(std::pair<double, double>(0.987842, 2)); - pbns.push_back(std::pair<double, double>(0.990127, 1)); - pbns.push_back(std::pair<double, double>(0.994537, 0)); + std::vector<std::pair<double, size_t> > pbns; + pbns.push_back(std::pair<double, size_t>(0.0290362, 1)); + pbns.push_back(std::pair<double, size_t>(0.0307676, 2)); + pbns.push_back(std::pair<double, size_t>(0.0366312, 3)); + pbns.push_back(std::pair<double, size_t>(0.0544614, 4)); + pbns.push_back(std::pair<double, size_t>(0.0920033, 5)); + pbns.push_back(std::pair<double, size_t>(0.104599, 6)); + pbns.push_back(std::pair<double, size_t>(0.114718, 7)); + pbns.push_back(std::pair<double, size_t>(0.117379, 8)); + pbns.push_back(std::pair<double, size_t>(0.123493, 9)); + pbns.push_back(std::pair<double, size_t>(0.133638, 10)); + pbns.push_back(std::pair<double, size_t>(0.137798, 9)); + pbns.push_back(std::pair<double, size_t>(0.149798, 10)); + pbns.push_back(std::pair<double, size_t>(0.155421, 11)); + pbns.push_back(std::pair<double, size_t>(0.158443, 12)); + pbns.push_back(std::pair<double, size_t>(0.176956, 13)); + pbns.push_back(std::pair<double, size_t>(0.183234, 12)); + pbns.push_back(std::pair<double, size_t>(0.191069, 13)); + pbns.push_back(std::pair<double, size_t>(0.191333, 14)); + pbns.push_back(std::pair<double, size_t>(0.191836, 15)); + pbns.push_back(std::pair<double, size_t>(0.192675, 16)); + pbns.push_back(std::pair<double, size_t>(0.208564, 17)); + pbns.push_back(std::pair<double, size_t>(0.218425, 18)); + pbns.push_back(std::pair<double, size_t>(0.219902, 17)); + pbns.push_back(std::pair<double, size_t>(0.23233, 16)); + pbns.push_back(std::pair<double, size_t>(0.234558, 17)); + pbns.push_back(std::pair<double, size_t>(0.237166, 16)); + pbns.push_back(std::pair<double, size_t>(0.247352, 17)); + pbns.push_back(std::pair<double, size_t>(0.267421, 18)); + pbns.push_back(std::pair<double, size_t>(0.268093, 19)); + pbns.push_back(std::pair<double, size_t>(0.278734, 18)); + pbns.push_back(std::pair<double, size_t>(0.284722, 19)); + pbns.push_back(std::pair<double, size_t>(0.284998, 20)); + pbns.push_back(std::pair<double, size_t>(0.294069, 21)); + pbns.push_back(std::pair<double, size_t>(0.306293, 22)); + pbns.push_back(std::pair<double, size_t>(0.322361, 21)); + pbns.push_back(std::pair<double, size_t>(0.323152, 22)); + pbns.push_back(std::pair<double, size_t>(0.371021, 23)); + pbns.push_back(std::pair<double, size_t>(0.372395, 24)); + pbns.push_back(std::pair<double, size_t>(0.387744, 25)); + pbns.push_back(std::pair<double, size_t>(0.435537, 26)); + pbns.push_back(std::pair<double, size_t>(0.462911, 25)); + pbns.push_back(std::pair<double, size_t>(0.483569, 26)); + pbns.push_back(std::pair<double, size_t>(0.489209, 25)); + pbns.push_back(std::pair<double, size_t>(0.517115, 24)); + pbns.push_back(std::pair<double, size_t>(0.522197, 23)); + pbns.push_back(std::pair<double, size_t>(0.532665, 22)); + pbns.push_back(std::pair<double, size_t>(0.545262, 23)); + pbns.push_back(std::pair<double, size_t>(0.587227, 22)); + pbns.push_back(std::pair<double, size_t>(0.593036, 23)); + pbns.push_back(std::pair<double, size_t>(0.602647, 24)); + pbns.push_back(std::pair<double, size_t>(0.605044, 25)); + pbns.push_back(std::pair<double, size_t>(0.621962, 24)); + pbns.push_back(std::pair<double, size_t>(0.629449, 23)); + pbns.push_back(std::pair<double, size_t>(0.636719, 22)); + pbns.push_back(std::pair<double, size_t>(0.64957, 21)); + pbns.push_back(std::pair<double, size_t>(0.650781, 22)); + pbns.push_back(std::pair<double, size_t>(0.654951, 23)); + pbns.push_back(std::pair<double, size_t>(0.683489, 24)); + pbns.push_back(std::pair<double, size_t>(0.687172, 23)); + pbns.push_back(std::pair<double, size_t>(0.69703, 22)); + pbns.push_back(std::pair<double, size_t>(0.701174, 21)); + pbns.push_back(std::pair<double, size_t>(0.717623, 22)); + pbns.push_back(std::pair<double, size_t>(0.722023, 21)); + pbns.push_back(std::pair<double, size_t>(0.722298, 20)); + pbns.push_back(std::pair<double, size_t>(0.725347, 19)); + pbns.push_back(std::pair<double, size_t>(0.73071, 18)); + pbns.push_back(std::pair<double, size_t>(0.758355, 17)); + pbns.push_back(std::pair<double, size_t>(0.770913, 18)); + pbns.push_back(std::pair<double, size_t>(0.790833, 17)); + pbns.push_back(std::pair<double, size_t>(0.821211, 16)); + pbns.push_back(std::pair<double, size_t>(0.849305, 17)); + pbns.push_back(std::pair<double, size_t>(0.853669, 16)); + pbns.push_back(std::pair<double, size_t>(0.866659, 15)); + pbns.push_back(std::pair<double, size_t>(0.872896, 16)); + pbns.push_back(std::pair<double, size_t>(0.889597, 15)); + pbns.push_back(std::pair<double, size_t>(0.900231, 14)); + pbns.push_back(std::pair<double, size_t>(0.903847, 13)); + pbns.push_back(std::pair<double, size_t>(0.906299, 12)); + pbns.push_back(std::pair<double, size_t>(0.910852, 11)); + pbns.push_back(std::pair<double, size_t>(0.93453, 10)); + pbns.push_back(std::pair<double, size_t>(0.944757, 9)); + pbns.push_back(std::pair<double, size_t>(0.947812, 8)); + pbns.push_back(std::pair<double, size_t>(0.959154, 7)); + pbns.push_back(std::pair<double, size_t>(0.975654, 6)); + pbns.push_back(std::pair<double, size_t>(0.976719, 5)); + pbns.push_back(std::pair<double, size_t>(0.977343, 4)); + pbns.push_back(std::pair<double, size_t>(0.980129, 3)); + pbns.push_back(std::pair<double, size_t>(0.987842, 2)); + pbns.push_back(std::pair<double, size_t>(0.990127, 1)); + pbns.push_back(std::pair<double, size_t>(0.994537, 0)); std::vector<std::pair<double, size_t> > pbns_new = p.compute_persistent_betti_numbers(); for (size_t i = 0; i != pbns.size(); ++i) { - // cout << pbns_new[i].first << "," << pbns_new[i].second << std::endl; - BOOST_CHECK(fabs(pbns[i].first - pbns_new[i].first) <= epsilon); - BOOST_CHECK(fabs(pbns[i].second - pbns_new[i].second) <= epsilon); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(pbns[i].first, pbns_new[i].first, Gudhi::Persistence_representations::epsi); + BOOST_CHECK(pbns[i].second == pbns_new[i].second); } } @@ -297,7 +287,6 @@ BOOST_AUTO_TEST_CASE(check_k_n_n) { knn_template.push_back(0.786945); for (size_t i = 0; i != knn.size(); ++i) { - // cout << knn[i] << std::endl; - BOOST_CHECK(fabs(knn[i] - knn_template[i]) <= 0.000005); + GUDHI_TEST_FLOAT_EQUALITY_CHECK(knn[i], knn_template[i], Gudhi::Persistence_representations::epsi); } } |