summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-07-31 14:59:22 +0200
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-07-31 14:59:22 +0200
commitcb79887df3f5155224ccc6c79d6a0e04853925ea (patch)
tree66560efe402f3b2f1713087731c8e7cb3f141e3b
parent76a61bcd3279a98bd84856b011869a0be2ba99cd (diff)
code review: simplifify traces
-rwxr-xr-xsrc/python/example/rips_complex_edge_collapse_example.py23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/python/example/rips_complex_edge_collapse_example.py b/src/python/example/rips_complex_edge_collapse_example.py
index e352c155..b26eb9fc 100755
--- a/src/python/example/rips_complex_edge_collapse_example.py
+++ b/src/python/example/rips_complex_edge_collapse_example.py
@@ -26,21 +26,19 @@ off_file = gudhi.__root_source_dir__ + '/data/points/tore3D_300.off'
point_cloud = gudhi.read_points_from_off_file(off_file = off_file)
rips_complex = gudhi.RipsComplex(points=point_cloud, max_edge_length=12.0)
simplex_tree = rips_complex.create_simplex_tree(max_dimension=1)
-result_str = '1. Rips complex is of dimension ' + repr(simplex_tree.dimension()) + ' - ' + \
- repr(simplex_tree.num_simplices()) + ' simplices - ' + \
- repr(simplex_tree.num_vertices()) + ' vertices.'
-print(result_str)
+print('1. Rips complex is of dimension ', simplex_tree.dimension(), ' - ',
+ simplex_tree.num_simplices(), ' simplices - ',
+ simplex_tree.num_vertices(), ' vertices.')
# Expansion of this one-skeleton would require a lot of memory. Let's collapse it
start = time.process_time()
simplex_tree.collapse_edges()
+print('2. Rips complex is of dimension ', simplex_tree.dimension(), ' - ',
+ simplex_tree.num_simplices(), ' simplices - ',
+ simplex_tree.num_vertices(), ' vertices.')
simplex_tree.expansion(3)
diag = simplex_tree.persistence()
print("Collapse, expansion and persistence computation took ", time.process_time() - start, " sec.")
-result_str = '2. Rips complex is of dimension ' + repr(simplex_tree.dimension()) + ' - ' + \
- repr(simplex_tree.num_simplices()) + ' simplices - ' + \
- repr(simplex_tree.num_vertices()) + ' vertices.'
-print(result_str)
# Use subplots to display diagram and density side by side
fig, axes = plt.subplots(nrows=1, ncols=2, figsize=(12, 5))
@@ -50,16 +48,15 @@ axes[0].set_title("Persistence after 1 collapse")
# Collapse can be performed several times. Let's collapse it 3 times
start = time.process_time()
simplex_tree.collapse_edges(nb_iterations = 3)
+print('3. Rips complex is of dimension ', simplex_tree.dimension(), ' - ',
+ simplex_tree.num_simplices(), ' simplices - ',
+ simplex_tree.num_vertices(), ' vertices.')
simplex_tree.expansion(3)
diag = simplex_tree.persistence()
print("Collapse, expansion and persistence computation took ", time.process_time() - start, " sec.")
-result_str = '3. Rips complex is of dimension ' + repr(simplex_tree.dimension()) + ' - ' + \
- repr(simplex_tree.num_simplices()) + ' simplices - ' + \
- repr(simplex_tree.num_vertices()) + ' vertices.'
-print(result_str)
gudhi.plot_persistence_diagram(diag, axes=axes[1])
axes[1].set_title("Persistence after 3 more collapses")
# Plot the 2 persistence diagrams side to side to check the persistence is the same
-plt.show()
+plt.show() \ No newline at end of file