From 1a728400187d89db914e865a979c85c7260b0b02 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 21 Nov 2016 16:24:15 +0000 Subject: Add distance matrix rips construction (doc, code, test) git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1766 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 6b9bdecbaf0aca12facb023e66bdea71e8e8cd38 --- src/common/test/test_distance_matrix_reader.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/common/test') diff --git a/src/common/test/test_distance_matrix_reader.cpp b/src/common/test/test_distance_matrix_reader.cpp index 7eb7e846..a4c46bb1 100644 --- a/src/common/test/test_distance_matrix_reader.cpp +++ b/src/common/test/test_distance_matrix_reader.cpp @@ -47,21 +47,21 @@ BOOST_AUTO_TEST_CASE( lower_triangular_distance_matrix ) std::cout << "from_lower_triangular size = " << from_lower_triangular.size() << std::endl; BOOST_CHECK(from_lower_triangular.size() == 5); - for (int i = 0; i < from_lower_triangular.size(); i++) { + 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; BOOST_CHECK(from_lower_triangular[i].size() == i); } std::vector expected = {1}; - BOOST_CHECK(from_lower_triangular[0] == expected); + BOOST_CHECK(from_lower_triangular[1] == expected); expected = {2,3}; - BOOST_CHECK(from_lower_triangular[0] == expected); + BOOST_CHECK(from_lower_triangular[2] == expected); expected = {4,5,6}; - BOOST_CHECK(from_lower_triangular[0] == expected); + BOOST_CHECK(from_lower_triangular[3] == expected); expected = {7,8,9,10}; - BOOST_CHECK(from_lower_triangular[0] == expected); + BOOST_CHECK(from_lower_triangular[4] == expected); } @@ -78,8 +78,8 @@ BOOST_AUTO_TEST_CASE( full_square_distance_matrix ) } std::cout << "from_full_square size = " << from_full_square.size() << std::endl; BOOST_CHECK(from_full_square.size() == 5); - for (int i = 0; i < from_lower_triangular.size(); i++) { - std::cout << "from_lower_triangular[" << i << "] size = " << from_lower_triangular[i].size() << std::endl; - BOOST_CHECK(from_lower_triangular[i].size() == i); + 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; + BOOST_CHECK(from_full_square[i].size() == i); } } -- cgit v1.2.3