From af146a2e48c16855355ac599cbc617250727d244 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 25 Nov 2016 16:00:19 +0000 Subject: Add of tangential complex doc Separate simplex tree from alpha complex git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1788 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1cf4a35e0a099501eb1cb6b9809041dd1a1e2617 --- ...ex_diagram_persistence_from_off_file_example.py | 10 +++++---- .../example/alpha_complex_from_points_example.py | 25 +++++++++++----------- 2 files changed, 19 insertions(+), 16 deletions(-) (limited to 'src/cython/example') diff --git a/src/cython/example/alpha_complex_diagram_persistence_from_off_file_example.py b/src/cython/example/alpha_complex_diagram_persistence_from_off_file_example.py index d74eba57..40d06f93 100755 --- a/src/cython/example/alpha_complex_diagram_persistence_from_off_file_example.py +++ b/src/cython/example/alpha_complex_diagram_persistence_from_off_file_example.py @@ -52,15 +52,17 @@ with open(args.file, 'r') as f: message = "AlphaComplex with max_edge_length=" + repr(args.max_alpha_square) print(message) - alpha_complex = gudhi.AlphaComplex(off_file=args.file, max_alpha_square=args.max_alpha_square) + alpha_complex = gudhi.AlphaComplex(off_file=args.file) + simplex_tree = gudhi.SimplexTree() + alpha_complex.create_simplex_tree(simplex_tree, max_alpha_square=args.max_alpha_square) - message = "Number of simplices=" + repr(alpha_complex.num_simplices()) + message = "Number of simplices=" + repr(simplex_tree.num_simplices()) print(message) - diag = alpha_complex.persistence() + diag = simplex_tree.persistence() print("betti_numbers()=") - print(alpha_complex.betti_numbers()) + print(simplex_tree.betti_numbers()) if args.no_diagram == False: gudhi.diagram_persistence(diag) diff --git a/src/cython/example/alpha_complex_from_points_example.py b/src/cython/example/alpha_complex_from_points_example.py index da98f3d4..45319f7f 100755 --- a/src/cython/example/alpha_complex_from_points_example.py +++ b/src/cython/example/alpha_complex_from_points_example.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -import gudhi +from gudhi import AlphaComplex, SimplexTree """This file is part of the Gudhi Library. The Gudhi library (Geometric Understanding in Higher Dimensions) is a generic C++ @@ -30,38 +30,39 @@ __license__ = "GPL v3" print("#####################################################################") print("AlphaComplex creation from points") -alpha_complex = gudhi.AlphaComplex(points=[[0, 0], [1, 0], [0, 1], [1, 1]], - max_alpha_square=60.0) +alpha_complex = AlphaComplex(points=[[0, 0], [1, 0], [0, 1], [1, 1]]) +simplex_tree = SimplexTree() +alpha_complex.create_simplex_tree(simplex_tree, max_alpha_square=60.0) -if alpha_complex.find([0, 1]): +if simplex_tree.find([0, 1]): print("[0, 1] Found !!") else: print("[0, 1] Not found...") -if alpha_complex.find([4]): +if simplex_tree.find([4]): print("[4] Found !!") else: print("[4] Not found...") -if alpha_complex.insert([0, 1, 2], filtration=4.0): +if simplex_tree.insert([0, 1, 2], filtration=4.0): print("[0, 1, 2] Inserted !!") else: print("[0, 1, 2] Not inserted...") -if alpha_complex.insert([0, 1, 4], filtration=4.0): +if simplex_tree.insert([0, 1, 4], filtration=4.0): print("[0, 1, 4] Inserted !!") else: print("[0, 1, 4] Not inserted...") -if alpha_complex.find([4]): +if simplex_tree.find([4]): print("[4] Found !!") else: print("[4] Not found...") -print("dimension=", alpha_complex.dimension()) -print("filtered_tree=", alpha_complex.get_filtered_tree()) -print("star([0])=", alpha_complex.get_star_tree([0])) -print("coface([0], 1)=", alpha_complex.get_coface_tree([0], 1)) +print("dimension=", simplex_tree.dimension()) +print("filtered_tree=", simplex_tree.get_filtered_tree()) +print("star([0])=", simplex_tree.get_star_tree([0])) +print("coface([0], 1)=", simplex_tree.get_coface_tree([0], 1)) print("point[0]=", alpha_complex.get_point(0)) print("point[5]=", alpha_complex.get_point(5)) -- cgit v1.2.3