Rename plot_persistence_diagram and barcode

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2220 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 66a06ffdc62d5284119df80c3f104a48568cd241

14 files changed, 20 insertions, 20 deletions

diff --git a/src/cython/cython/persistence_graphical_tools.py b/src/cython/cython/persistence_graphical_tools.py
index d7287a66..a984633e 100755
--- a/src/cython/cython/persistence_graphical_tools.py
+++ b/src/cython/cython/persistence_graphical_tools.py
@@ -73,7 +73,7 @@ def show_palette_values(alpha=0.6):
 
     plt.show()
 
-def plot_barcode_persistence(persistence, alpha=0.6):
+def plot_persistence_barcode(persistence, alpha=0.6):
     """This function plots the persistence bar code.
 
     :param persistence: The persistence to plot.
@@ -108,7 +108,7 @@ def plot_barcode_persistence(persistence, alpha=0.6):
     plt.axis([axis_start, infinity, 0, ind])
     plt.show()
 
-def plot_diagram_persistence(persistence, alpha=0.6):
+def plot_persistence_diagram(persistence, alpha=0.6):
     """This function plots the persistence diagram.
 
     :param persistence: The persistence to plot.
diff --git a/src/cython/doc/persistence_graphical_tools_ref.rst b/src/cython/doc/persistence_graphical_tools_ref.rst
index 3d7e4fc7..27c2f68a 100644
--- a/src/cython/doc/persistence_graphical_tools_ref.rst
+++ b/src/cython/doc/persistence_graphical_tools_ref.rst
@@ -4,5 +4,5 @@ Persistence graphical tools reference manual
 
 .. autofunction:: gudhi.__min_birth_max_death
 .. autofunction:: gudhi.show_palette_values
-.. autofunction:: gudhi.plot_barcode_persistence
-.. autofunction:: gudhi.plot_diagram_persistence
+.. autofunction:: gudhi.plot_persistence_barcode
+.. autofunction:: gudhi.plot_persistence_diagram
diff --git a/src/cython/doc/persistence_graphical_tools_user.rst b/src/cython/doc/persistence_graphical_tools_user.rst
index 2644aa11..f713e971 100644
--- a/src/cython/doc/persistence_graphical_tools_user.rst
+++ b/src/cython/doc/persistence_graphical_tools_user.rst
@@ -33,7 +33,7 @@ This function can display the persistence result as a barcode:
     
     periodic_cc = gudhi.PeriodicCubicalComplex(perseus_file='3d_torus.txt')
     diag = periodic_cc.persistence()
-    gudhi.plot_barcode_persistence(diag)
+    gudhi.plot_persistence_barcode(diag)
 
 .. plot::
 
@@ -41,7 +41,7 @@ This function can display the persistence result as a barcode:
 
     periodic_cc = gudhi.PeriodicCubicalComplex(perseus_file='3d_torus.txt')
     diag = periodic_cc.persistence()
-    gudhi.plot_barcode_persistence(diag)
+    gudhi.plot_persistence_barcode(diag)
 
 Show persistence as a diagram
 -----------------------------
@@ -55,7 +55,7 @@ This function can display the persistence result as a diagram:
     rips_complex = gudhi.RipsComplex(off_file='tore3D_300.off', max_edge_length=2.0)
     simplex_tree = rips_complex.create_simplex_tree(max_dimension=3)
     diag = simplex_tree.persistence()
-    gudhi.plot_diagram_persistence(diag)
+    gudhi.plot_persistence_diagram(diag)
 
 .. plot::
 
@@ -64,4 +64,4 @@ This function can display the persistence result as a diagram:
     rips_complex = gudhi.RipsComplex(off_file='tore3D_300.off', max_edge_length=2.0)
     simplex_tree = rips_complex.create_simplex_tree(max_dimension=3)
     diag = simplex_tree.persistence()
-    gudhi.plot_diagram_persistence(diag)
+    gudhi.plot_persistence_diagram(diag)
diff --git a/src/cython/doc/pyplots/barcode_persistence.py b/src/cython/doc/pyplots/barcode_persistence.py
index 9fcb33d0..c06ac5a7 100755
--- a/src/cython/doc/pyplots/barcode_persistence.py
+++ b/src/cython/doc/pyplots/barcode_persistence.py
@@ -2,4 +2,4 @@ import gudhi
 
 periodic_cc = gudhi.PeriodicCubicalComplex(perseus_file='../3d_torus.txt')
 diag = periodic_cc.persistence()
-gudhi.plot_barcode_persistence(diag)
+gudhi.plot_persistence_barcode(diag)
diff --git a/src/cython/doc/pyplots/diagram_persistence.py b/src/cython/doc/pyplots/diagram_persistence.py
index fbb6e60b..b4714fe3 100755
--- a/src/cython/doc/pyplots/diagram_persistence.py
+++ b/src/cython/doc/pyplots/diagram_persistence.py
@@ -2,4 +2,4 @@ import gudhi
 
 alpha_complex = gudhi.AlphaComplex(off_file='../tore3D_300.off')
 diag = alpha_complex.persistence()
-gudhi.plot_diagram_persistence(diag)
+gudhi.plot_persistence_diagram(diag)
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 9714b382..adedc7d2 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.plot_diagram_persistence(diag)
+            gudhi.plot_persistence_diagram(diag)
     else:
         print(args.file, "is not a valid OFF file")
 
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 3addf708..2474fc87 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
@@ -70,7 +70,7 @@ with open(args.file, 'r') as f:
         print(simplex_tree.betti_numbers())
 
         if args.no_diagram == False:
-            gudhi.plot_diagram_persistence(diag)
+            gudhi.plot_persistence_diagram(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 1e7d788a..5a75417b 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
@@ -70,7 +70,7 @@ with open(args.file, 'r') as f:
         print(simplex_tree.betti_numbers())
 
         if args.no_diagram == False:
-            gudhi.plot_diagram_persistence(diag)
+            gudhi.plot_persistence_diagram(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 f1aa5d73..bc3b16ec 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.plot_barcode_persistence(persistence)
+gudhi.plot_persistence_barcode(persistence)
 
 print("#####################################################################")
 print("Show diagram persistence example")
 
-gudhi.plot_diagram_persistence(persistence)
+gudhi.plot_persistence_diagram(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 128706b2..db530161 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.plot_barcode_persistence(diag)
+        gudhi.plot_persistence_barcode(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 5f1416be..664eb5c4 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.plot_diagram_persistence(diag)
+            gudhi.plot_persistence_diagram(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 4f888e77..4c21b98e 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.plot_diagram_persistence(diag)
+            gudhi.plot_persistence_diagram(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 3d51f379..4e5cd2c8 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.plot_diagram_persistence(diag)
+gudhi.plot_persistence_diagram(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 a3fc9911..4845eb47 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.plot_diagram_persistence(diag)
+            gudhi.plot_persistence_diagram(diag)
     else:
         print(args.file, "is not a valid OFF file")