summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-02-03 11:52:24 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-02-03 11:52:24 +0000
commit9781709e1c8ba405140345ba2e7d3e521e533e16 (patch)
tree63a225374945f8ab7f67ac33e30579f115c9d92b
parent26bed354555e0f0fc18c6adc6a4b0fe27379a4a6 (diff)
it is a simplex and not a simplex handle
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@999 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 4bfc8fe6051480854acbd68fdb5c6f09624aa3da
-rw-r--r--src/Simplex_tree/include/gudhi/Simplex_tree.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 0d12e9b7..3569b323 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -1132,9 +1132,9 @@ class Simplex_tree {
bool make_filtration_non_decreasing() {
bool modified = false;
// Loop must be from the end to the beginning, as higher dimension simplex are always on the left part of the tree
- for (auto& sh : boost::adaptors::reverse(root_.members())) {
- if (has_children(&sh)) {
- modified |= rec_make_filtration_non_decreasing(sh.second.children());
+ for (auto& simplex : boost::adaptors::reverse(root_.members())) {
+ if (has_children(&simplex)) {
+ modified |= rec_make_filtration_non_decreasing(simplex.second.children());
}
}
return modified;
@@ -1149,22 +1149,22 @@ class Simplex_tree {
bool modified = false;
// Loop must be from the end to the beginning, as higher dimension simplex are always on the left part of the tree
- for (auto& sh : boost::adaptors::reverse(sib->members())) {
+ for (auto& simplex : boost::adaptors::reverse(sib->members())) {
// Find the maximum filtration value in the border
- Boundary_simplex_range boundary = boundary_simplex_range(&sh);
+ Boundary_simplex_range boundary = boundary_simplex_range(&simplex);
Boundary_simplex_iterator max_border = std::max_element(std::begin(boundary), std::end(boundary),
[](Simplex_handle sh1, Simplex_handle sh2) {
return filtration(sh1) < filtration(sh2);
} );
Filtration_value max_filt_border_value = filtration(*max_border);
- if (sh.second.filtration() < max_filt_border_value) {
+ if (simplex.second.filtration() < max_filt_border_value) {
// Store the filtration modification information
modified = true;
- sh.second.assign_filtration(max_filt_border_value);
+ simplex.second.assign_filtration(max_filt_border_value);
}
- if (has_children(&sh)) {
- modified |= rec_make_filtration_non_decreasing(sh.second.children());
+ if (has_children(&simplex)) {
+ modified |= rec_make_filtration_non_decreasing(simplex.second.children());
}
}
// Make the modified information to be traced by upper call