From 7c20f9bf5829aa4ebe26ee59fb0120852dc0a5f3 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 31 May 2016 15:34:04 +0000 Subject: Add CONVENTIONS file to say Gudhi follows PEP8 Add persistence and betti numbers getters git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1228 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: d52d7e30d3feffe206deb14e741960987ba9fa7c --- src/cython/example/alpha_complex_example.py | 10 ++++++++-- src/cython/example/mini_simplex_tree_example.py | 3 ++- src/cython/example/rips_complex_example.py | 4 ++-- src/cython/example/simplex_tree_example.py | 9 +++++---- 4 files changed, 17 insertions(+), 9 deletions(-) (limited to 'src/cython/example') diff --git a/src/cython/example/alpha_complex_example.py b/src/cython/example/alpha_complex_example.py index 6996b692..37c04f23 100755 --- a/src/cython/example/alpha_complex_example.py +++ b/src/cython/example/alpha_complex_example.py @@ -66,6 +66,12 @@ print("coface([0], 1)=", alpha_complex.get_coface_tree([0], 1)) print("point[0]=", alpha_complex.get_point(0)) print("point[5]=", alpha_complex.get_point(5)) +print("betti_numbers()=") +print(alpha_complex.betti_numbers()) + alpha_complex.initialize_filtration() -print("persistence(2)=", alpha_complex.persistence(homology_coeff_field=2, - min_persistence=0)) +print("persistence(homology_coeff_field=2, min_persistence=0)=") +print(alpha_complex.persistence(homology_coeff_field=2, min_persistence=0)) + +print("betti_numbers()=") +print(alpha_complex.betti_numbers()) diff --git a/src/cython/example/mini_simplex_tree_example.py b/src/cython/example/mini_simplex_tree_example.py index 0461a1df..d7189ddf 100755 --- a/src/cython/example/mini_simplex_tree_example.py +++ b/src/cython/example/mini_simplex_tree_example.py @@ -55,7 +55,8 @@ mini_st.set_dimension(2) # initialize_filtration required before plain_homology mini_st.initialize_filtration() -print("plain_homology(2)=", mini_st.plain_homology(2)) +print("persistence(homology_coeff_field=2)=") +print(mini_st.persistence(homology_coeff_field=2)) edge02 = [0, 2] if mini_st.find(edge02): diff --git a/src/cython/example/rips_complex_example.py b/src/cython/example/rips_complex_example.py index eba3f298..449ea2b3 100755 --- a/src/cython/example/rips_complex_example.py +++ b/src/cython/example/rips_complex_example.py @@ -37,5 +37,5 @@ print("filtered_tree=", rips.get_filtered_tree()) print("star([0])=", rips.get_star_tree([0])) print("coface([0], 1)=", rips.get_coface_tree([0], 1)) -print("persistence(2)=", rips.persistence(homology_coeff_field=2, - min_persistence=0)) +print("persistence(homology_coeff_field=2, min_persistence=0)=") +print(rips.persistence(homology_coeff_field=2, min_persistence=0)) diff --git a/src/cython/example/simplex_tree_example.py b/src/cython/example/simplex_tree_example.py index bdaabca2..45d57c53 100755 --- a/src/cython/example/simplex_tree_example.py +++ b/src/cython/example/simplex_tree_example.py @@ -2,8 +2,6 @@ import gudhi -st = gudhi.SimplexTree() - """This file is part of the Gudhi Library. The Gudhi library (Geometric Understanding in Higher Dimensions) is a generic C++ library for computational topology. @@ -32,6 +30,9 @@ __license__ = "GPL v3" print("#####################################################################") print("SimplexTree creation from insertion") + +st = gudhi.SimplexTree() + if st.insert([0, 1]): print("Inserted !!") else: @@ -64,5 +65,5 @@ print("skeleton_tree[2]=", st.get_skeleton_tree(2)) print("skeleton_tree[1]=", st.get_skeleton_tree(1)) print("skeleton_tree[0]=", st.get_skeleton_tree(0)) -print("persistence(2)=", st.persistence(homology_coeff_field=2, - min_persistence=0)) +print("persistence(homology_coeff_field=2, min_persistence=0)=") +print(st.persistence(homology_coeff_field=2, min_persistence=0)) -- cgit v1.2.3