diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
| commit | 1390b4c5e1207f41b66c69edc66496a5f9b63b12 (patch) | |
| tree | 912a03dd3477931f5d90f20be558e3afb5ef7ebe /src/python/gudhi/simplex_tree.pxd | |
| parent | 458bc2dcf5044e1d5fde5326b2be35e526abd457 (diff) | |
| parent | 4737aaeb36a4ff3b27d7bcbb374911197ed09e5a (diff) | |
Merge master & 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 e1b03391..6ec85bca 100644 --- a/src/python/gudhi/simplex_tree.pxd +++ b/src/python/gudhi/simplex_tree.pxd @@ -63,6 +63,7 @@ cdef extern from "Simplex_tree_interface.h" namespace "Gudhi": bool make_filtration_non_decreasing() nogil 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 # 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 |