diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-25 11:19:30 +0200 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-25 11:19:30 +0200 |
commit | eac4be3f7549d7482fa6668658a1b896e6d5e89a (patch) | |
tree | f3bed356f107acf78e3a6ac3a8f58fcb8994f977 /src/Collapse/example/edge_collapse_conserve_persistence.cpp | |
parent | ddd12a6caab2040d7e8e6573c71f9da4a90bb346 (diff) | |
parent | e4e55054945ec25bba613bf9051b9dde0b09357e (diff) |
Merge conflicts
Diffstat (limited to 'src/Collapse/example/edge_collapse_conserve_persistence.cpp')
-rw-r--r-- | src/Collapse/example/edge_collapse_conserve_persistence.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Collapse/example/edge_collapse_conserve_persistence.cpp b/src/Collapse/example/edge_collapse_conserve_persistence.cpp index 69755fc9..d78a4d54 100644 --- a/src/Collapse/example/edge_collapse_conserve_persistence.cpp +++ b/src/Collapse/example/edge_collapse_conserve_persistence.cpp @@ -68,9 +68,9 @@ std::vector<Persistence_interval> get_persistence_intervals(Simplex_tree& st, in auto persistent_pairs = pcoh.get_persistent_pairs(); std::sort(std::begin(persistent_pairs), std::end(persistent_pairs), cmp); for (auto pair : persistent_pairs) { - persistence_intervals.emplace_back(Persistence_interval(st.dimension(get<0>(pair)), - st.filtration(get<0>(pair)), - st.filtration(get<1>(pair)) )); + persistence_intervals.emplace_back(st.dimension(get<0>(pair)), + st.filtration(get<0>(pair)), + st.filtration(get<1>(pair))); } return persistence_intervals; } |