diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:55:42 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:55:42 +0200 |
| commit | a1cd7e9ead030654a1fdb6cfd50408103c458529 (patch) | |
| tree | 9786156bfb00d5b4f85dda2458b087d60d1bc1a8 /src/python/gudhi/simplex_tree.pxd | |
| parent | 85eec1ba750d56b66e3739dc486c6205f49fb31e (diff) | |
| parent | 4737aaeb36a4ff3b27d7bcbb374911197ed09e5a (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 12c2065e..3b494ba3 100644 --- a/src/python/gudhi/simplex_tree.pxd +++ b/src/python/gudhi/simplex_tree.pxd @@ -57,6 +57,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 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 |