diff options
author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
---|---|---|
committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
commit | 2b4bf47e209225a56687b2a7fa65b27ef4b00ab2 (patch) | |
tree | e876553cc2f8c18e0f504a33b26230d0e3e491ed /src/python/gudhi/simplex_tree.pyx | |
parent | 3253e504a0564bc75ffd4b1351e800593ffefd0f (diff) | |
parent | 7fa45f4f0c7fb89abf64bc61b26a6201ace16a7a (diff) |
Merge master and fix conflicts
Diffstat (limited to 'src/python/gudhi/simplex_tree.pyx')
-rw-r--r-- | src/python/gudhi/simplex_tree.pyx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/python/gudhi/simplex_tree.pyx b/src/python/gudhi/simplex_tree.pyx index 521a7763..05bfe22e 100644 --- a/src/python/gudhi/simplex_tree.pyx +++ b/src/python/gudhi/simplex_tree.pyx @@ -487,9 +487,9 @@ cdef class SimplexTree: otherwise it is kept. The algorithm then proceeds with the next candidate. .. warning:: - Several candidates of the same dimension may be inserted simultaneously before calling `block_simplex`, so - if you examine the complex in `block_simplex`, you may hit a few simplices of the same dimension that have - not been vetted by `block_simplex` yet, or have already been rejected but not yet removed. + Several candidates of the same dimension may be inserted simultaneously before calling `blocker_func`, so + if you examine the complex in `blocker_func`, you may hit a few simplices of the same dimension that have + not been vetted by `blocker_func` yet, or have already been rejected but not yet removed. :param max_dim: Expansion maximal dimension value. :type max_dim: int |