diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-22 13:29:59 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-22 13:29:59 +0000 |
commit | 71f9bed6df48dedc0d4e8ef620496af9c494eccc (patch) | |
tree | 0e785bcac501fb4d1507640dca06ab0bd47f4a7a /src/common | |
parent | 1a728400187d89db914e865a979c85c7260b0b02 (diff) |
Fix examples and tests
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1767 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 4a1c78aec05d443e0525bf24a0cc7f7b5c628629
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/include/gudhi/reader_utils.h | 21 | ||||
-rw-r--r-- | src/common/test/test_distance_matrix_reader.cpp | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h index 3799e583..ddec5ba7 100644 --- a/src/common/include/gudhi/reader_utils.h +++ b/src/common/include/gudhi/reader_utils.h @@ -223,10 +223,9 @@ bool read_hasse_simplex(std::istream & in_, std::vector< Simplex_key > & boundar template< typename Filtration_value > std::vector< std::vector< Filtration_value > > read_lower_triangular_matrix_from_csv_file(const std::string& filename, const char separator=';') { - bool dbg = false; - if (dbg) { - std::cerr << "Using procedure read_lower_triangular_matrix_from_csv_file \n"; - } +#ifdef DEBUG_TRACES + std::cout << "Using procedure read_lower_triangular_matrix_from_csv_file \n"; +#endif // DEBUG_TRACES std::vector< std::vector< Filtration_value > > result; std::ifstream in; in.open(filename.c_str()); @@ -278,15 +277,15 @@ std::vector< std::vector< Filtration_value > > read_lower_triangular_matrix_from } in.close(); - if (dbg) { - std::cerr << "Here is the matrix we read : \n"; - for (size_t i = 0; i != result.size(); ++i) { - for (size_t j = 0; j != result[i].size(); ++j) { - std::cerr << result[i][j] << " "; - } - std::cerr << std::endl; +#ifdef DEBUG_TRACES + std::cerr << "Here is the matrix we read : \n"; + for (size_t i = 0; i != result.size(); ++i) { + for (size_t j = 0; j != result[i].size(); ++j) { + std::cerr << result[i][j] << " "; } + std::cerr << std::endl; } +#endif // DEBUG_TRACES return result; } // read_lower_triangular_matrix_from_csv_file diff --git a/src/common/test/test_distance_matrix_reader.cpp b/src/common/test/test_distance_matrix_reader.cpp index a4c46bb1..95a73bd9 100644 --- a/src/common/test/test_distance_matrix_reader.cpp +++ b/src/common/test/test_distance_matrix_reader.cpp @@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE( full_square_distance_matrix ) std::cout << std::endl; } std::cout << "from_full_square size = " << from_full_square.size() << std::endl; - BOOST_CHECK(from_full_square.size() == 5); + 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; BOOST_CHECK(from_full_square[i].size() == i); |