diff options
| author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2021-11-02 10:53:05 +0100 |
|---|---|---|
| committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2021-11-02 10:53:05 +0100 |
| commit | 003abb66b7c657356328bc24306e2c5aef02b1d4 (patch) | |
| tree | 0530c8987c824da79ecddd22485f143831a4c71f /src/python/gudhi/simplex_tree.pxd | |
| parent | b1f604312adb6a9240f8e8b7effcd4bd7251e82b (diff) | |
| parent | 8adb46d8a54f1a0dd71ea686473cc4ca9f5d2f67 (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'src/python/gudhi/simplex_tree.pxd')
| -rw-r--r-- | src/python/gudhi/simplex_tree.pxd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/gudhi/simplex_tree.pxd b/src/python/gudhi/simplex_tree.pxd index 3b8ea4f9..006a24ed 100644 --- a/src/python/gudhi/simplex_tree.pxd +++ b/src/python/gudhi/simplex_tree.pxd @@ -78,7 +78,7 @@ cdef extern from "Simplex_tree_interface.h" namespace "Gudhi": cdef extern from "Persistent_cohomology_interface.h" namespace "Gudhi": cdef cppclass Simplex_tree_persistence_interface "Gudhi::Persistent_cohomology_interface<Gudhi::Simplex_tree<Gudhi::Simplex_tree_options_full_featured>>": Simplex_tree_persistence_interface(Simplex_tree_interface_full_featured * st, bool persistence_dim_max) nogil - void compute_persistence(int homology_coeff_field, double min_persistence) nogil + void compute_persistence(int homology_coeff_field, double min_persistence) nogil except + vector[pair[int, pair[double, double]]] get_persistence() nogil vector[int] betti_numbers() nogil vector[int] persistent_betti_numbers(double from_value, double to_value) nogil |