diff options
| author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-02-14 11:13:27 +0100 |
|---|---|---|
| committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-02-14 11:13:27 +0100 |
| commit | 1ffe721b41bfa73d87af443b29498f80f4479770 (patch) | |
| tree | b220bd6cdb262df54164c2891fa5386693a9a5a2 | |
| parent | 43981a4d487669fe2002337ab62b72dd9e83a64a (diff) | |
| parent | 2a2aae065bf34cfcf8bba52695ce3ae3ca6d4048 (diff) | |
Merge master
| -rw-r--r-- | src/python/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/python/gudhi/simplex_tree.pxd | 1 | ||||
| -rw-r--r-- | src/python/gudhi/simplex_tree.pyx | 7 | ||||
| -rwxr-xr-x | src/python/test/test_simplex_tree.py | 12 |
4 files changed, 24 insertions, 0 deletions
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 8eb7478e..777fae72 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -264,6 +264,10 @@ if(PYTHONINTERP_FOUND) set(GUDHI_PYTHON_INCLUDE_DIRS "${GUDHI_PYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ") endif() + if(DEBUG_TRACES) + set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DDEBUG_TRACES', ") + endif(DEBUG_TRACES) + if(UNIX AND WITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS) set( GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS "${GUDHI_PYTHON_LIBRARY_DIRS}") endif(UNIX AND WITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS) diff --git a/src/python/gudhi/simplex_tree.pxd b/src/python/gudhi/simplex_tree.pxd index 92139db4..5c98fb4a 100644 --- a/src/python/gudhi/simplex_tree.pxd +++ b/src/python/gudhi/simplex_tree.pxd @@ -66,6 +66,7 @@ cdef extern from "Simplex_tree_interface.h" namespace "Gudhi": 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 except + void reset_filtration(double filtration, int dimension) nogil + bint operator==(Simplex_tree_interface_full_featured) 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 diff --git a/src/python/gudhi/simplex_tree.pyx b/src/python/gudhi/simplex_tree.pyx index 0213e363..6701d98d 100644 --- a/src/python/gudhi/simplex_tree.pyx +++ b/src/python/gudhi/simplex_tree.pyx @@ -676,3 +676,10 @@ cdef class SimplexTree: self.thisptr = <intptr_t>(ptr.collapse_edges(nb_iter)) # Delete old pointer del ptr + + def __eq__(self, other:SimplexTree): + """Test for structural equality + :returns: True if the 2 simplex trees are equal, False otherwise. + :rtype: bool + """ + return dereference(self.get_ptr()) == dereference(other.get_ptr()) diff --git a/src/python/test/test_simplex_tree.py b/src/python/test/test_simplex_tree.py index 62dcc865..32fc63ec 100755 --- a/src/python/test/test_simplex_tree.py +++ b/src/python/test/test_simplex_tree.py @@ -448,6 +448,18 @@ def test_persistence_intervals_in_dimension(): # Test empty case assert st.persistence_intervals_in_dimension(3).shape == (0, 2) +def test_equality_operator(): + st1 = SimplexTree() + st2 = SimplexTree() + + assert st1 == st2 + + st1.insert([1,2,3], 4.) + assert st1 != st2 + + st2.insert([1,2,3], 4.) + assert st1 == st2 + def test_simplex_tree_deep_copy(): st = SimplexTree() st.insert([1, 2, 3], 0.) |