diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:43:16 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:43:16 +0100 |
commit | bf4b4eeda9762ed9e99c2b24f19331fa0111fcfe (patch) | |
tree | 03950723bd824ba3c69597e022500dfd5f37e914 /src/common/test | |
parent | c7b70317b643b2eb9c603602da9c979388829821 (diff) |
Code review: Use std::clog instead of std::cout
Diffstat (limited to 'src/common/test')
-rw-r--r-- | src/common/test/test_distance_matrix_reader.cpp | 16 | ||||
-rw-r--r-- | src/common/test/test_persistence_intervals_reader.cpp | 124 |
2 files changed, 70 insertions, 70 deletions
diff --git a/src/common/test/test_distance_matrix_reader.cpp b/src/common/test/test_distance_matrix_reader.cpp index bb619a29..73be8104 100644 --- a/src/common/test/test_distance_matrix_reader.cpp +++ b/src/common/test/test_distance_matrix_reader.cpp @@ -28,15 +28,15 @@ BOOST_AUTO_TEST_CASE( lower_triangular_distance_matrix ) ','); for (auto& i : from_lower_triangular) { for (auto j : i) { - std::cout << j << " "; + std::clog << j << " "; } - std::cout << std::endl; + std::clog << std::endl; } - std::cout << "from_lower_triangular size = " << from_lower_triangular.size() << std::endl; + std::clog << "from_lower_triangular size = " << from_lower_triangular.size() << std::endl; BOOST_CHECK(from_lower_triangular.size() == 5); for (std::size_t i = 0; i < from_lower_triangular.size(); i++) { - std::cout << "from_lower_triangular[" << i << "] size = " << from_lower_triangular[i].size() << std::endl; + std::clog << "from_lower_triangular[" << i << "] size = " << from_lower_triangular[i].size() << std::endl; BOOST_CHECK(from_lower_triangular[i].size() == i); } std::vector<double> expected = {1}; @@ -60,14 +60,14 @@ BOOST_AUTO_TEST_CASE( full_square_distance_matrix ) from_full_square = Gudhi::read_lower_triangular_matrix_from_csv_file<double>("full_square_distance_matrix.csv"); for (auto& i : from_full_square) { for (auto j : i) { - std::cout << j << " "; + std::clog << j << " "; } - std::cout << std::endl; + std::clog << std::endl; } - std::cout << "from_full_square size = " << from_full_square.size() << std::endl; + std::clog << "from_full_square size = " << from_full_square.size() << std::endl; BOOST_CHECK(from_full_square.size() == 7); for (std::size_t i = 0; i < from_full_square.size(); i++) { - std::cout << "from_full_square[" << i << "] size = " << from_full_square[i].size() << std::endl; + std::clog << "from_full_square[" << i << "] size = " << from_full_square[i].size() << std::endl; BOOST_CHECK(from_full_square[i].size() == i); } } diff --git a/src/common/test/test_persistence_intervals_reader.cpp b/src/common/test/test_persistence_intervals_reader.cpp index 8fb4377d..ac8d0981 100644 --- a/src/common/test/test_persistence_intervals_reader.cpp +++ b/src/common/test/test_persistence_intervals_reader.cpp @@ -35,18 +35,18 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_without_dimension ) Persistence_intervals_by_dimension persistence_intervals_by_dimension = Gudhi::read_persistence_intervals_grouped_by_dimension("persistence_intervals_without_dimension.pers"); - std::cout << "\nread_persistence_intervals_grouped_by_dimension - expected\n"; + std::clog << "\nread_persistence_intervals_grouped_by_dimension - expected\n"; for (auto map_iter : expected_intervals_by_dimension) { - std::cout << "key=" << map_iter.first; + std::clog << "key=" << map_iter.first; for (auto vec_iter : map_iter.second) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; } - std::cout << "\nread_persistence_intervals_grouped_by_dimension - read\n"; + std::clog << "\nread_persistence_intervals_grouped_by_dimension - read\n"; for (auto map_iter : persistence_intervals_by_dimension) { - std::cout << "key=" << map_iter.first; + std::clog << "key=" << map_iter.first; for (auto vec_iter : map_iter.second) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; } BOOST_CHECK(persistence_intervals_by_dimension == expected_intervals_by_dimension); @@ -60,13 +60,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_without_dimension ) Persistence_intervals persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_without_dimension.pers"); - std::cout << "\nread_persistence_intervals_in_dimension - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension - read\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -103,18 +103,18 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_dimension ) Persistence_intervals_by_dimension persistence_intervals_by_dimension = Gudhi::read_persistence_intervals_grouped_by_dimension("persistence_intervals_with_dimension.pers"); - std::cout << "\nread_persistence_intervals_grouped_by_dimension - expected\n"; + std::clog << "\nread_persistence_intervals_grouped_by_dimension - expected\n"; for (auto map_iter : expected_intervals_by_dimension) { - std::cout << "key=" << map_iter.first; + std::clog << "key=" << map_iter.first; for (auto vec_iter : map_iter.second) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; } - std::cout << "\nread_persistence_intervals_grouped_by_dimension - read\n"; + std::clog << "\nread_persistence_intervals_grouped_by_dimension - read\n"; for (auto map_iter : persistence_intervals_by_dimension) { - std::cout << "key=" << map_iter.first; + std::clog << "key=" << map_iter.first; for (auto vec_iter : map_iter.second) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; } BOOST_CHECK(persistence_intervals_by_dimension == expected_intervals_by_dimension); @@ -128,13 +128,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_dimension ) Persistence_intervals persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_dimension.pers"); - std::cout << "\nread_persistence_intervals_in_dimension - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -143,13 +143,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_dimension ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_dimension.pers", 0); - std::cout << "\nread_persistence_intervals_in_dimension 0 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 0 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 0 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 0 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -159,13 +159,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_dimension ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_dimension.pers", 1); - std::cout << "\nread_persistence_intervals_in_dimension 1 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 1 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 1 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 1 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -173,13 +173,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_dimension ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_dimension.pers", 2); - std::cout << "\nread_persistence_intervals_in_dimension 2 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 2 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 2 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 2 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -188,13 +188,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_dimension ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_dimension.pers", 3); - std::cout << "\nread_persistence_intervals_in_dimension 3 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 3 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 3 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 3 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -212,18 +212,18 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_field ) Persistence_intervals_by_dimension persistence_intervals_by_dimension = Gudhi::read_persistence_intervals_grouped_by_dimension("persistence_intervals_with_field.pers"); - std::cout << "\nread_persistence_intervals_grouped_by_dimension - expected\n"; + std::clog << "\nread_persistence_intervals_grouped_by_dimension - expected\n"; for (auto map_iter : expected_intervals_by_dimension) { - std::cout << "key=" << map_iter.first; + std::clog << "key=" << map_iter.first; for (auto vec_iter : map_iter.second) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; } - std::cout << "\nread_persistence_intervals_grouped_by_dimension - read\n"; + std::clog << "\nread_persistence_intervals_grouped_by_dimension - read\n"; for (auto map_iter : persistence_intervals_by_dimension) { - std::cout << "key=" << map_iter.first; + std::clog << "key=" << map_iter.first; for (auto vec_iter : map_iter.second) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; } BOOST_CHECK(persistence_intervals_by_dimension == expected_intervals_by_dimension); @@ -237,13 +237,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_field ) Persistence_intervals persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_field.pers"); - std::cout << "\nread_persistence_intervals_in_dimension - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -252,13 +252,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_field ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_field.pers", 0); - std::cout << "\nread_persistence_intervals_in_dimension 0 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 0 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 0 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 0 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -268,13 +268,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_field ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_field.pers", 1); - std::cout << "\nread_persistence_intervals_in_dimension 1 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 1 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 1 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 1 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -282,13 +282,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_field ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_field.pers", 2); - std::cout << "\nread_persistence_intervals_in_dimension 2 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 2 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 2 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 2 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); @@ -297,13 +297,13 @@ BOOST_AUTO_TEST_CASE( persistence_intervals_with_field ) persistence_intervals_in_dimension = Gudhi::read_persistence_intervals_in_dimension("persistence_intervals_with_field.pers", 3); - std::cout << "\nread_persistence_intervals_in_dimension 3 - expected\n"; + std::clog << "\nread_persistence_intervals_in_dimension 3 - expected\n"; for (auto vec_iter : expected_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; - std::cout << "\nread_persistence_intervals_in_dimension 3 - read\n"; + std::clog << "\nread_persistence_intervals_in_dimension 3 - read\n"; for (auto vec_iter : persistence_intervals_in_dimension) - std::cout << " [" << vec_iter.first << " ," << vec_iter.second << "] "; + std::clog << " [" << vec_iter.first << " ," << vec_iter.second << "] "; BOOST_CHECK(persistence_intervals_in_dimension == expected_intervals_in_dimension); |