From bf4b4eeda9762ed9e99c2b24f19331fa0111fcfe Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 27 Jan 2020 10:43:16 +0100 Subject: Code review: Use std::clog instead of std::cout --- src/Toplex_map/test/lazy_toplex_map_unit_test.cpp | 76 +++++++++++------------ src/Toplex_map/test/toplex_map_unit_test.cpp | 50 +++++++-------- 2 files changed, 63 insertions(+), 63 deletions(-) (limited to 'src/Toplex_map/test') diff --git a/src/Toplex_map/test/lazy_toplex_map_unit_test.cpp b/src/Toplex_map/test/lazy_toplex_map_unit_test.cpp index 639bf35a..994cee8e 100644 --- a/src/Toplex_map/test/lazy_toplex_map_unit_test.cpp +++ b/src/Toplex_map/test/lazy_toplex_map_unit_test.cpp @@ -20,43 +20,43 @@ BOOST_AUTO_TEST_CASE(toplex_map) { using Vertex = Gudhi::Lazy_toplex_map::Vertex; Gudhi::Lazy_toplex_map tm; - std::cout << "insert_simplex {1, 2, 3, 4}" << std::endl; + std::clog << "insert_simplex {1, 2, 3, 4}" << std::endl; std::vector sigma1 = {1, 2, 3, 4}; tm.insert_simplex(sigma1); - std::cout << "insert_simplex {5, 2, 3, 6}" << std::endl; + std::clog << "insert_simplex {5, 2, 3, 6}" << std::endl; std::vector sigma2 = {5, 2, 3, 6}; tm.insert_simplex(sigma2); - std::cout << "insert_simplex {5}" << std::endl; + std::clog << "insert_simplex {5}" << std::endl; std::vector sigma3 = {5}; tm.insert_simplex(sigma3); - std::cout << "insert_simplex {4, 5, 3}" << std::endl; + std::clog << "insert_simplex {4, 5, 3}" << std::endl; std::vector sigma6 = {4, 5, 3}; tm.insert_simplex(sigma6); - std::cout << "insert_simplex {4, 5, 9}" << std::endl; + std::clog << "insert_simplex {4, 5, 9}" << std::endl; std::vector sigma7 = {4, 5, 9}; tm.insert_simplex(sigma7); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 5); std::vector sigma4 = {5, 2, 3}; std::vector sigma5 = {5, 2, 7}; BOOST_CHECK(tm.membership(sigma4)); BOOST_CHECK(!tm.membership(sigma5)); - std::cout << "insert_simplex {5, 2, 7}" << std::endl; + std::clog << "insert_simplex {5, 2, 7}" << std::endl; tm.insert_simplex(sigma5); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 6); BOOST_CHECK(tm.membership(sigma5)); - std::cout << "contraction(4,5)" << std::endl; + std::clog << "contraction(4,5)" << std::endl; auto r = tm.contraction(4, 5); - std::cout << "r=" << r << std::endl; + std::clog << "r=" << r << std::endl; BOOST_CHECK(r == 5); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 6); std::vector sigma8 = {1, 2, 3}; @@ -68,11 +68,11 @@ BOOST_AUTO_TEST_CASE(toplex_map) { BOOST_CHECK(tm.membership(sigma8)); BOOST_CHECK(tm.membership(sigma9)); - std::cout << "remove_simplex({2, 7, r = 5})" << std::endl; + std::clog << "remove_simplex({2, 7, r = 5})" << std::endl; tm.remove_simplex(sigma9); BOOST_CHECK(!tm.membership(sigma9)); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 8); // {2, 7, 5} is removed, but verify its edges are still there @@ -88,71 +88,71 @@ BOOST_AUTO_TEST_CASE(toplex_map_empty_toplex) { using Vertex = Gudhi::Lazy_toplex_map::Vertex; Gudhi::Lazy_toplex_map tm; - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 0); - std::cout << "num_vertices = " << tm.num_vertices() << std::endl; + std::clog << "num_vertices = " << tm.num_vertices() << std::endl; BOOST_CHECK(tm.num_vertices() == 0); - std::cout << "Check an empty simplex is a member." << std::endl; + std::clog << "Check an empty simplex is a member." << std::endl; std::vector empty_sigma = {}; BOOST_CHECK(tm.membership(empty_sigma)); - std::cout << "Check the edge 2,7 is not a member." << std::endl; + std::clog << "Check the edge 2,7 is not a member." << std::endl; std::vector edge = {2, 7}; BOOST_CHECK(!tm.membership(edge)); - std::cout << "Insert an empty simplex." << std::endl; + std::clog << "Insert an empty simplex." << std::endl; tm.insert_simplex(empty_sigma); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 0); - std::cout << "num_vertices = " << tm.num_vertices() << std::endl; + std::clog << "num_vertices = " << tm.num_vertices() << std::endl; BOOST_CHECK(tm.num_vertices() == 0); - std::cout << "Check an empty simplex is a member." << std::endl; + std::clog << "Check an empty simplex is a member." << std::endl; BOOST_CHECK(tm.membership(empty_sigma)); - std::cout << "Check the edge 2,7 is not a member." << std::endl; + std::clog << "Check the edge 2,7 is not a member." << std::endl; BOOST_CHECK(!tm.membership(edge)); - std::cout << "Insert edge 2,7." << std::endl; + std::clog << "Insert edge 2,7." << std::endl; tm.insert_simplex(edge); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 1); - std::cout << "num_vertices = " << tm.num_vertices() << std::endl; + std::clog << "num_vertices = " << tm.num_vertices() << std::endl; BOOST_CHECK(tm.num_vertices() == 2); - std::cout << "Check an empty simplex is a member." << std::endl; + std::clog << "Check an empty simplex is a member." << std::endl; BOOST_CHECK(tm.membership(empty_sigma)); - std::cout << "Check the edge 2,7 is a member." << std::endl; + std::clog << "Check the edge 2,7 is a member." << std::endl; BOOST_CHECK(tm.membership(edge)); - std::cout << "contraction(2,7)" << std::endl; + std::clog << "contraction(2,7)" << std::endl; auto r = tm.contraction(2, 7); - std::cout << "r=" << r << std::endl; + std::clog << "r=" << r << std::endl; BOOST_CHECK(r == 7); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 1); - std::cout << "num_vertices = " << tm.num_vertices() << std::endl; + std::clog << "num_vertices = " << tm.num_vertices() << std::endl; BOOST_CHECK(tm.num_vertices() == 1); - std::cout << "Check an empty simplex is a member." << std::endl; + std::clog << "Check an empty simplex is a member." << std::endl; BOOST_CHECK(tm.membership(empty_sigma)); - std::cout << "Check the edge 2,7 is not a member." << std::endl; + std::clog << "Check the edge 2,7 is not a member." << std::endl; BOOST_CHECK(!tm.membership(edge)); - std::cout << "Remove the vertex 7." << std::endl; + std::clog << "Remove the vertex 7." << std::endl; std::vector vertex = {7}; tm.remove_simplex(vertex); - std::cout << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices = " << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 0); - std::cout << "num_vertices = " << tm.num_vertices() << std::endl; + std::clog << "num_vertices = " << tm.num_vertices() << std::endl; BOOST_CHECK(tm.num_vertices() == 0); - std::cout << "Check an empty simplex is a member." << std::endl; + std::clog << "Check an empty simplex is a member." << std::endl; BOOST_CHECK(tm.membership(empty_sigma)); - std::cout << "Check the edge 2,7 is not a member." << std::endl; + std::clog << "Check the edge 2,7 is not a member." << std::endl; BOOST_CHECK(!tm.membership(edge)); } diff --git a/src/Toplex_map/test/toplex_map_unit_test.cpp b/src/Toplex_map/test/toplex_map_unit_test.cpp index 24ec679b..0d0751ff 100644 --- a/src/Toplex_map/test/toplex_map_unit_test.cpp +++ b/src/Toplex_map/test/toplex_map_unit_test.cpp @@ -20,31 +20,31 @@ BOOST_AUTO_TEST_CASE(toplex_map) { using Vertex = Gudhi::Toplex_map::Vertex; Gudhi::Toplex_map tm; - std::cout << "insert_simplex {1, 2, 3, 4}" << std::endl; + std::clog << "insert_simplex {1, 2, 3, 4}" << std::endl; std::vector sigma1 = {1, 2, 3, 4}; tm.insert_simplex(sigma1); - std::cout << "insert_simplex {5, 2, 3, 6}" << std::endl; + std::clog << "insert_simplex {5, 2, 3, 6}" << std::endl; std::vector sigma2 = {5, 2, 3, 6}; tm.insert_simplex(sigma2); - std::cout << "insert_simplex {5}" << std::endl; + std::clog << "insert_simplex {5}" << std::endl; std::vector sigma3 = {5}; tm.insert_simplex(sigma3); - std::cout << "insert_simplex {4, 5, 3}" << std::endl; + std::clog << "insert_simplex {4, 5, 3}" << std::endl; std::vector sigma6 = {4, 5, 3}; tm.insert_simplex(sigma6); - std::cout << "insert_simplex {4, 5, 9}" << std::endl; + std::clog << "insert_simplex {4, 5, 9}" << std::endl; std::vector sigma7 = {4, 5, 9}; tm.insert_simplex(sigma7); - std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 4); // Browse maximal simplices - std::cout << "Maximal simplices are :" << std::endl; + std::clog << "Maximal simplices are :" << std::endl; for (auto simplex_ptr : tm.maximal_simplices()) { for (auto v : *simplex_ptr) { - std::cout << v << ", "; + std::clog << v << ", "; } - std::cout << std::endl; + std::clog << std::endl; BOOST_CHECK(tm.maximality(*simplex_ptr)); } @@ -58,37 +58,37 @@ BOOST_AUTO_TEST_CASE(toplex_map) { std::vector sigma5 = {5, 2, 7}; BOOST_CHECK(tm.membership(sigma4)); BOOST_CHECK(!tm.membership(sigma5)); - std::cout << "insert_simplex {5, 2, 7}" << std::endl; + std::clog << "insert_simplex {5, 2, 7}" << std::endl; tm.insert_simplex(sigma5); - std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 5); // Browse maximal simplices - std::cout << "Maximal simplices are :" << std::endl; + std::clog << "Maximal simplices are :" << std::endl; for (auto simplex_ptr : tm.maximal_simplices()) { for (auto v : *simplex_ptr) { - std::cout << v << ", "; + std::clog << v << ", "; } - std::cout << std::endl; + std::clog << std::endl; BOOST_CHECK(tm.maximality(*simplex_ptr)); } BOOST_CHECK(tm.membership(sigma5)); - std::cout << "contraction(4,5)" << std::endl; + std::clog << "contraction(4,5)" << std::endl; auto r = tm.contraction(4, 5); - std::cout << "r=" << r << std::endl; + std::clog << "r=" << r << std::endl; BOOST_CHECK(r == 5); - std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 4); // Browse maximal simplices - std::cout << "Maximal simplices are :" << std::endl; + std::clog << "Maximal simplices are :" << std::endl; for (auto simplex_ptr : tm.maximal_simplices()) { for (auto v : *simplex_ptr) { - std::cout << v << ", "; + std::clog << v << ", "; } - std::cout << std::endl; + std::clog << std::endl; BOOST_CHECK(tm.maximality(*simplex_ptr)); } @@ -101,19 +101,19 @@ BOOST_AUTO_TEST_CASE(toplex_map) { BOOST_CHECK(tm.membership(sigma8)); BOOST_CHECK(tm.membership(sigma9)); - std::cout << "remove_simplex({2, 7, r = 5})" << std::endl; + std::clog << "remove_simplex({2, 7, r = 5})" << std::endl; tm.remove_simplex(sigma9); BOOST_CHECK(!tm.membership(sigma9)); - std::cout << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; + std::clog << "num_maximal_simplices" << tm.num_maximal_simplices() << std::endl; BOOST_CHECK(tm.num_maximal_simplices() == 5); // Browse maximal simplices - std::cout << "Maximal simplices are :" << std::endl; + std::clog << "Maximal simplices are :" << std::endl; for (auto simplex_ptr : tm.maximal_simplices()) { for (auto v : *simplex_ptr) { - std::cout << v << ", "; + std::clog << v << ", "; } - std::cout << std::endl; + std::clog << std::endl; BOOST_CHECK(tm.maximality(*simplex_ptr)); } // {2, 7, 5} is removed, but verify its edges are still there -- cgit v1.2.3