summaryrefslogtreecommitdiff
path: root/src/python/gudhi/simplex_tree.pyx
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2020-03-24 20:31:05 +0100
committerMarc Glisse <marc.glisse@inria.fr>2020-03-24 20:31:05 +0100
commitd5c8dc1ba4d00ead5875b97e164d07f6180526b0 (patch)
treeded0e0df8fdc7ff1ed3600b830cf1ab93c83b715 /src/python/gudhi/simplex_tree.pyx
parentec4a9583adaa73c01b05a4b30425581ed7256379 (diff)
print -> assert
Diffstat (limited to 'src/python/gudhi/simplex_tree.pyx')
-rw-r--r--src/python/gudhi/simplex_tree.pyx47
1 files changed, 21 insertions, 26 deletions
diff --git a/src/python/gudhi/simplex_tree.pyx b/src/python/gudhi/simplex_tree.pyx
index beb40bc4..dcf1b46e 100644
--- a/src/python/gudhi/simplex_tree.pyx
+++ b/src/python/gudhi/simplex_tree.pyx
@@ -536,13 +536,11 @@ cdef class SimplexTree:
:note: lower_star_persistence_generators requires that `persistence()` be called first.
"""
- if self.pcohptr != NULL:
- gen = self.pcohptr.lower_star_generators()
- normal = [np_array(d).reshape(-1,2) for d in gen.first]
- infinite = [np_array(d) for d in gen.second]
- return (normal, infinite)
- else:
- print("lower_star_persistence_generators() requires that persistence() be called first.")
+ assert self.pcohptr != NULL, "lower_star_persistence_generators() requires that persistence() be called first."
+ gen = self.pcohptr.lower_star_generators()
+ normal = [np_array(d).reshape(-1,2) for d in gen.first]
+ infinite = [np_array(d) for d in gen.second]
+ return (normal, infinite)
def flag_persistence_generators(self):
"""Assuming this is a flag complex, this function returns the persistence pairs,
@@ -556,23 +554,20 @@ cdef class SimplexTree:
:note: flag_persistence_generators requires that `persistence()` be called first.
"""
- if self.pcohptr != NULL:
- gen = self.pcohptr.flag_generators()
- if len(gen.first) == 0:
- normal0 = numpy.empty((0,3))
- normals = []
- else:
- l = iter(gen.first)
- normal0 = np_array(next(l)).reshape(-1,3)
- normals = [np_array(d).reshape(-1,4) for d in l]
- if len(gen.second) == 0:
- infinite0 = numpy.empty(0)
- infinites = []
- else:
- l = iter(gen.second)
- infinite0 = np_array(next(l))
- infinites = [np_array(d).reshape(-1,2) for d in l]
-
- return (normal0, normals, infinite0, infinites)
+ assert self.pcohptr != NULL, "flag_persistence_generators() requires that persistence() be called first."
+ gen = self.pcohptr.flag_generators()
+ if len(gen.first) == 0:
+ normal0 = numpy.empty((0,3))
+ normals = []
+ else:
+ l = iter(gen.first)
+ normal0 = np_array(next(l)).reshape(-1,3)
+ normals = [np_array(d).reshape(-1,4) for d in l]
+ if len(gen.second) == 0:
+ infinite0 = numpy.empty(0)
+ infinites = []
else:
- print("flag_persistence_generators() requires that persistence() be called first.")
+ l = iter(gen.second)
+ infinite0 = np_array(next(l))
+ infinites = [np_array(d).reshape(-1,2) for d in l]
+ return (normal0, normals, infinite0, infinites)