diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-02 09:25:06 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-02 09:25:06 +0100 |
commit | af5af2df409576035f2e31564f4048278d4f0f19 (patch) | |
tree | 44fde353aa1e7c41e680c153182af0933b489487 /src/python/gudhi/simplex_tree.pxd | |
parent | 4186971033ee43821905cac53791bf074751d3af (diff) | |
parent | 6b995c03793096459a333c907b606770113b96d7 (diff) |
Merge master and resolve conflicts
Diffstat (limited to 'src/python/gudhi/simplex_tree.pxd')
-rw-r--r-- | src/python/gudhi/simplex_tree.pxd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/gudhi/simplex_tree.pxd b/src/python/gudhi/simplex_tree.pxd index 6ec85bca..3c4cbed3 100644 --- a/src/python/gudhi/simplex_tree.pxd +++ b/src/python/gudhi/simplex_tree.pxd @@ -64,6 +64,7 @@ cdef extern from "Simplex_tree_interface.h" namespace "Gudhi": void compute_extended_filtration() nogil vector[vector[pair[int, pair[double, double]]]] compute_extended_persistence_subdiagrams(vector[pair[int, pair[double, double]]] dgm, double min_persistence) nogil Simplex_tree_interface_full_featured* collapse_edges(int nb_collapse_iteration) nogil + void reset_filtration(double filtration, int dimension) nogil # Iterators over Simplex tree pair[vector[int], double] get_simplex_and_filtration(Simplex_tree_simplex_handle f_simplex) nogil Simplex_tree_simplices_iterator get_simplices_iterator_begin() nogil |