From 30374ed5154610dc63198742220153aa9387139c Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 20 Mar 2017 15:48:04 +0000 Subject: Rename barcode_persistence and diagram_persistence functions git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2204 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: f91e283fa6b6b02198ae28a44f41bd761c1c1f48 --- .../alpha_complex_diagram_persistence_from_off_file_example.py | 2 +- src/cython/example/alpha_rips_persistence_bottleneck_distance.py | 2 -- ...trong_witness_complex_diagram_persistence_from_off_file_example.py | 4 ++-- ...idean_witness_complex_diagram_persistence_from_off_file_example.py | 4 ++-- src/cython/example/gudhi_graphical_tools_example.py | 4 ++-- ...c_cubical_complex_barcode_persistence_from_perseus_file_example.py | 2 +- ...s_complex_diagram_persistence_from_distance_matrix_file_example.py | 2 +- .../example/rips_complex_diagram_persistence_from_off_file_example.py | 2 +- src/cython/example/rips_persistence_diagram.py | 2 +- .../tangential_complex_plain_homology_from_off_file_example.py | 2 +- 10 files changed, 12 insertions(+), 14 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 ae03aa67..9714b382 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 @@ -63,7 +63,7 @@ with open(args.file, 'r') as f: print(simplex_tree.betti_numbers()) if args.no_diagram == False: - gudhi.diagram_persistence(diag) + gudhi.plot_diagram_persistence(diag) else: print(args.file, "is not a valid OFF file") diff --git a/src/cython/example/alpha_rips_persistence_bottleneck_distance.py b/src/cython/example/alpha_rips_persistence_bottleneck_distance.py index 04a59b44..cd64704b 100755 --- a/src/cython/example/alpha_rips_persistence_bottleneck_distance.py +++ b/src/cython/example/alpha_rips_persistence_bottleneck_distance.py @@ -42,8 +42,6 @@ parser.add_argument("-t", "--threshold", type=float, default=0.5) parser.add_argument("-d", "--max_dimension", type=int, default=1) args = parser.parse_args() -print(repr(float('inf'))) -print(repr(math.sqrt(float('inf')))) with open(args.file, 'r') as f: first_line = f.readline() if (first_line == 'OFF\n') or (first_line == 'nOFF\n'): diff --git a/src/cython/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py b/src/cython/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py index 6c3e3a8a..3addf708 100755 --- a/src/cython/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py +++ b/src/cython/example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py @@ -34,7 +34,7 @@ parser = argparse.ArgumentParser(description='EuclideanStrongWitnessComplex crea epilog='Example: ' 'example/witness_complex_diagram_persistence_from_off_file_example.py ' '-f ../data/points/tore3D_300.off -a 1.0 -n 20 -d 2' - '- Constructs a alpha complex with the ' + '- Constructs a strong witness complex with the ' 'points from the given OFF file.') parser.add_argument("-f", "--file", type=str, required=True) parser.add_argument("-a", "--max_alpha_square", type=float, required=True) @@ -70,7 +70,7 @@ with open(args.file, 'r') as f: print(simplex_tree.betti_numbers()) if args.no_diagram == False: - gudhi.diagram_persistence(diag) + gudhi.plot_diagram_persistence(diag) else: print(args.file, "is not a valid OFF file") diff --git a/src/cython/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py b/src/cython/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py index 7f04a98e..1e7d788a 100755 --- a/src/cython/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py +++ b/src/cython/example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py @@ -34,7 +34,7 @@ parser = argparse.ArgumentParser(description='EuclideanWitnessComplex creation f epilog='Example: ' 'example/witness_complex_diagram_persistence_from_off_file_example.py ' '-f ../data/points/tore3D_300.off -a 1.0 -n 20 -d 2' - '- Constructs a alpha complex with the ' + '- Constructs a weak witness complex with the ' 'points from the given OFF file.') parser.add_argument("-f", "--file", type=str, required=True) parser.add_argument("-a", "--max_alpha_square", type=float, required=True) @@ -70,7 +70,7 @@ with open(args.file, 'r') as f: print(simplex_tree.betti_numbers()) if args.no_diagram == False: - gudhi.diagram_persistence(diag) + gudhi.plot_diagram_persistence(diag) else: print(args.file, "is not a valid OFF file") diff --git a/src/cython/example/gudhi_graphical_tools_example.py b/src/cython/example/gudhi_graphical_tools_example.py index 40558bee..f1aa5d73 100755 --- a/src/cython/example/gudhi_graphical_tools_example.py +++ b/src/cython/example/gudhi_graphical_tools_example.py @@ -39,9 +39,9 @@ print("Show barcode persistence example") persistence = [(2, (1.0, float('inf'))), (1, (1.4142135623730951, float('inf'))), (1, (1.4142135623730951, float('inf'))), (0, (0.0, float('inf'))), (0, (0.0, 1.0)), (0, (0.0, 1.0)), (0, (0.0, 1.0))] -gudhi.barcode_persistence(persistence) +gudhi.plot_barcode_persistence(persistence) print("#####################################################################") print("Show diagram persistence example") -gudhi.diagram_persistence(persistence) +gudhi.plot_diagram_persistence(persistence) diff --git a/src/cython/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py b/src/cython/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py index a9545ee9..128706b2 100755 --- a/src/cython/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py +++ b/src/cython/example/periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py @@ -71,6 +71,6 @@ if is_file_perseus(args.file): print("betti_numbers()=") print(periodic_cubical_complex.betti_numbers()) if args.no_barcode == False: - gudhi.barcode_persistence(diag) + gudhi.plot_barcode_persistence(diag) else: print(args.file, "is not a valid perseus style file") diff --git a/src/cython/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py b/src/cython/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py index 2b726f90..5f1416be 100755 --- a/src/cython/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py +++ b/src/cython/example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py @@ -64,7 +64,7 @@ with open(args.file, 'r') as f: print(simplex_tree.betti_numbers()) if args.no_diagram == False: - gudhi.diagram_persistence(diag) + gudhi.plot_diagram_persistence(diag) else: print(args.file, "is not a valid OFF file") diff --git a/src/cython/example/rips_complex_diagram_persistence_from_off_file_example.py b/src/cython/example/rips_complex_diagram_persistence_from_off_file_example.py index eb1c4ed5..4f888e77 100755 --- a/src/cython/example/rips_complex_diagram_persistence_from_off_file_example.py +++ b/src/cython/example/rips_complex_diagram_persistence_from_off_file_example.py @@ -64,7 +64,7 @@ with open(args.file, 'r') as f: print(simplex_tree.betti_numbers()) if args.no_diagram == False: - gudhi.diagram_persistence(diag) + gudhi.plot_diagram_persistence(diag) else: print(args.file, "is not a valid OFF file") diff --git a/src/cython/example/rips_persistence_diagram.py b/src/cython/example/rips_persistence_diagram.py index e485b2f5..3d51f379 100755 --- a/src/cython/example/rips_persistence_diagram.py +++ b/src/cython/example/rips_persistence_diagram.py @@ -39,4 +39,4 @@ simplex_tree = rips.create_simplex_tree(max_dimension=1) diag = simplex_tree.persistence(homology_coeff_field=2, min_persistence=0) print("diag=", diag) -gudhi.diagram_persistence(diag) +gudhi.plot_diagram_persistence(diag) diff --git a/src/cython/example/tangential_complex_plain_homology_from_off_file_example.py b/src/cython/example/tangential_complex_plain_homology_from_off_file_example.py index be4c40be..a3fc9911 100755 --- a/src/cython/example/tangential_complex_plain_homology_from_off_file_example.py +++ b/src/cython/example/tangential_complex_plain_homology_from_off_file_example.py @@ -59,7 +59,7 @@ with open(args.file, 'r') as f: print(st.betti_numbers()) if args.no_diagram == False: - gudhi.diagram_persistence(diag) + gudhi.plot_diagram_persistence(diag) else: print(args.file, "is not a valid OFF file") -- cgit v1.2.3