diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-19 21:24:07 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-19 21:24:07 +0000 |
commit | d04f3f02858044180471fc7e38948ff73e330162 (patch) | |
tree | 74d3dbf53df3267f32d9ce34a350615ca5e58847 /src/Simplex_tree | |
parent | 5cdf5825e0e5a937c5bbc5cee49ed9aa34f0af0e (diff) | |
parent | ca4f5e87e79701e48bb8697b19250be1b67c5f77 (diff) |
Merge of warning_fix branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1512 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8fd75ab3cb6a02013df18f6d5048755d39524b70
Diffstat (limited to 'src/Simplex_tree')
-rw-r--r-- | src/Simplex_tree/doc/Intro_simplex_tree.h | 3 | ||||
-rw-r--r-- | src/Simplex_tree/test/simplex_tree_unit_test.cpp | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/Simplex_tree/doc/Intro_simplex_tree.h b/src/Simplex_tree/doc/Intro_simplex_tree.h index ddf9ad22..be061785 100644 --- a/src/Simplex_tree/doc/Intro_simplex_tree.h +++ b/src/Simplex_tree/doc/Intro_simplex_tree.h @@ -28,6 +28,7 @@ namespace Gudhi { /** \defgroup simplex_tree Filtered Complexes + * @{ * \author Clément Maria * * A simplicial complex \f$\mathbf{K}\f$ on a set of vertices \f$V = \{1, \cdots ,|V|\}\f$ is a collection of @@ -76,7 +77,7 @@ Number of vertices = 10 Number of simplices = 98 \endcode * compact and harder to construct from scratch. * * \copyright GNU General Public License v3. - * @{ + * @} */ } // namespace Gudhi diff --git a/src/Simplex_tree/test/simplex_tree_unit_test.cpp b/src/Simplex_tree/test/simplex_tree_unit_test.cpp index b1bb23b1..28bf202b 100644 --- a/src/Simplex_tree/test/simplex_tree_unit_test.cpp +++ b/src/Simplex_tree/test/simplex_tree_unit_test.cpp @@ -806,14 +806,14 @@ BOOST_AUTO_TEST_CASE(make_filtration_non_decreasing) { st.insert_simplex_and_subfaces({3, 0}, 2.0); st.insert_simplex_and_subfaces({3, 4, 5}, 2.0); - // Inserted simplex: - // 1 - // o - // /X\ - // o---o---o---o - // 2 0 3\X/4 - // o - // 5 + /* Inserted simplex: */ + /* 1 */ + /* o */ + /* /X\ */ + /* o---o---o---o */ + /* 2 0 3\X/4 */ + /* o */ + /* 5 */ std::cout << "Check default insertion ensures the filtration values are non decreasing" << std::endl; BOOST_CHECK(!st.make_filtration_non_decreasing()); |