diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-10-12 12:42:11 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-10-12 12:42:11 +0000 |
commit | 004ff4cfc01d1c8128a2b39092dbfbc25149069d (patch) | |
tree | e13fc9c4c59bc101a249d427594c39f3c45ebb85 /src/Toplex_map/include | |
parent | 4e11105c6ab550f664699fc25b71d06884fa2bd3 (diff) |
Rename num_simplices num_maximal_simplices
Make unitary tests working
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/toplex_map@3947 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: eddea297f7cf6a0fd172ceaa3fbb28b6e3cb2e63
Diffstat (limited to 'src/Toplex_map/include')
-rw-r--r-- | src/Toplex_map/include/gudhi/Lazy_Toplex_map.h | 5 | ||||
-rw-r--r-- | src/Toplex_map/include/gudhi/Toplex_map.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/Toplex_map/include/gudhi/Lazy_Toplex_map.h b/src/Toplex_map/include/gudhi/Lazy_Toplex_map.h index 25281998..ea10d390 100644 --- a/src/Toplex_map/include/gudhi/Lazy_Toplex_map.h +++ b/src/Toplex_map/include/gudhi/Lazy_Toplex_map.h @@ -3,7 +3,6 @@ #include <gudhi/Toplex_map.h> #include <boost/heap/fibonacci_heap.hpp> -#include <cmath> namespace Gudhi { @@ -67,7 +66,7 @@ public: /** \brief Number of simplices stored. * \ingroup toplex_map */ - std::size_t num_simplices() const; + std::size_t num_maximal_simplices() const; std::unordered_map<Vertex, std::size_t> gamma0_lbounds; @@ -254,7 +253,7 @@ void Lazy_Toplex_map::clean(const Vertex v){ insert_simplex(*sptr); } -std::size_t Lazy_Toplex_map::num_simplices() const{ +std::size_t Lazy_Toplex_map::num_maximal_simplices() const{ return size; } diff --git a/src/Toplex_map/include/gudhi/Toplex_map.h b/src/Toplex_map/include/gudhi/Toplex_map.h index 73d2c63d..5a6c7dbf 100644 --- a/src/Toplex_map/include/gudhi/Toplex_map.h +++ b/src/Toplex_map/include/gudhi/Toplex_map.h @@ -88,7 +88,7 @@ public: /** \brief Number of maximal simplices. * \ingroup toplex_map */ - std::size_t num_simplices() const; + std::size_t num_maximal_simplices() const; std::set<Toplex_map::Vertex> unitary_collapse(const Toplex_map::Vertex k, const Toplex_map::Vertex d); @@ -251,7 +251,7 @@ void Toplex_map::remove_vertex(const Toplex_map::Vertex x){ } } -std::size_t Toplex_map::num_simplices() const{ +std::size_t Toplex_map::num_maximal_simplices() const{ return maximal_cofaces(Simplex()).size(); } |