summaryrefslogtreecommitdiff
path: root/src/Simplex_tree/include
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2015-08-20 08:06:14 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2015-08-20 08:06:14 +0000
commitb5423f4097f9656e740cac168597984f27d11061 (patch)
treebe0f58ab3a3403bcd69822e25e142a7099232a8e /src/Simplex_tree/include
parent0d427fd713cceddd8335e6e6bbac74db18e5dd7c (diff)
Fix code review remarks
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/num_simplices@744 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bc59d1dab02559ab645230d8c2df93f140bfcf10
Diffstat (limited to 'src/Simplex_tree/include')
-rw-r--r--src/Simplex_tree/include/gudhi/Simplex_tree.h18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index db5de0b8..d4a52113 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -362,27 +362,19 @@ class Simplex_tree {
public:
/** \brief returns the number of simplices in the simplex_tree. */
- long long int num_simplices() {
- auto sib_begin = root_.members().begin();
- auto sib_end = root_.members().end();
- long long int simplices_number = sib_end - sib_begin;
- for (auto sh = sib_begin; sh != sib_end; ++sh) {
- if (has_children(sh)) {
- simplices_number += rec_num_simplices(sh->second.children());
- }
- }
- return simplices_number;
+ size_t num_simplices() {
+ return num_simplices(&root_);
}
private:
/** \brief returns the number of simplices in the simplex_tree. */
- long long int rec_num_simplices(Siblings * sib = nullptr) {
+ size_t num_simplices(Siblings * sib) {
auto sib_begin = sib->members().begin();
auto sib_end = sib->members().end();
- long long int simplices_number = sib_end - sib_begin;
+ size_t simplices_number = sib_end - sib_begin;
for (auto sh = sib_begin; sh != sib_end; ++sh) {
if (has_children(sh)) {
- simplices_number += rec_num_simplices(sh->second.children());
+ simplices_number += num_simplices(sh->second.children());
}
}
return simplices_number;