Merge last trunk modifications

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

Former-commit-id: ba0fbf37ea8108d8c3ca21162d7cb815a92336f7

7 files changed, 10 insertions, 9 deletions

diff --git a/src/cython/example/alpha_complex_from_points_example.py b/src/cython/example/alpha_complex_from_points_example.py
index 688edb65..7d6278ce 100755
--- a/src/cython/example/alpha_complex_from_points_example.py
+++ b/src/cython/example/alpha_complex_from_points_example.py
@@ -59,7 +59,7 @@ else:
     print("[4] Not found...")
 
 print("dimension=", simplex_tree.dimension())
-print("filtered_tree=", simplex_tree.get_filtered_tree())
+print("filtrations=", simplex_tree.get_filtration())
 print("star([0])=", simplex_tree.get_star([0]))
 print("coface([0], 1)=", simplex_tree.get_cofaces([0], 1))
 
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 2474fc87..2371c36c 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
@@ -32,7 +32,7 @@ __license__ = "GPL v3"
 parser = argparse.ArgumentParser(description='EuclideanStrongWitnessComplex creation from '
                                  'points read in a OFF file.',
                                  epilog='Example: '
-                                 'example/witness_complex_diagram_persistence_from_off_file_example.py '
+                                 'example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py '
                                  '-f ../data/points/tore3D_300.off -a 1.0 -n 20 -d 2'
                                  '- Constructs a strong witness complex with the '
                                  'points from the given 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 5a75417b..5748aa8a 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
@@ -32,7 +32,7 @@ __license__ = "GPL v3"
 parser = argparse.ArgumentParser(description='EuclideanWitnessComplex creation from '
                                  'points read in a OFF file.',
                                  epilog='Example: '
-                                 'example/witness_complex_diagram_persistence_from_off_file_example.py '
+                                 'example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py '
                                  '-f ../data/points/tore3D_300.off -a 1.0 -n 20 -d 2'
                                  '- Constructs a weak witness complex with the '
                                  'points from the given OFF file.')
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 db530161..00334121 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
@@ -49,7 +49,7 @@ def is_file_perseus(file):
         return False
 
 parser = argparse.ArgumentParser(description='Periodic cubical complex from a '
-                                 'perseus file style name.',
+                                 'Perseus-style file name.',
                                  epilog='Example: '
                                  './periodic_cubical_complex_barcode_persistence_from_perseus_file_example.py'
                                  ' -f ../data/bitmap/CubicalTwoSphere.txt')
diff --git a/src/cython/example/random_cubical_complex_persistence_example.py b/src/cython/example/random_cubical_complex_persistence_example.py
index 1c55f777..c832d6bf 100755
--- a/src/cython/example/random_cubical_complex_persistence_example.py
+++ b/src/cython/example/random_cubical_complex_persistence_example.py
@@ -2,6 +2,7 @@
 
 import gudhi
 import numpy
+from functools import reduce
 import argparse
 import operator
 
@@ -54,4 +55,4 @@ if dimension_multiplication > 1:
     print(cubical_complex.persistence(homology_coeff_field=2, min_persistence=0))
 
     print("betti_numbers()=")
-    print(cubical_complex.betti_numbers())
\ No newline at end of file
+    print(cubical_complex.betti_numbers())
diff --git a/src/cython/example/rips_complex_from_points_example.py b/src/cython/example/rips_complex_from_points_example.py
index 9b7fc79d..5d411b1a 100755
--- a/src/cython/example/rips_complex_from_points_example.py
+++ b/src/cython/example/rips_complex_from_points_example.py
@@ -35,6 +35,6 @@ rips = gudhi.RipsComplex(points=[[0, 0], [1, 0], [0, 1], [1, 1]],
 
 simplex_tree = rips.create_simplex_tree(max_dimension=1)
 
-print("filtered_tree=", simplex_tree.get_filtered_tree())
+print("filtrations=", simplex_tree.get_filtration())
 print("star([0])=", simplex_tree.get_star([0]))
 print("coface([0], 1)=", simplex_tree.get_cofaces([0], 1))
diff --git a/src/cython/example/simplex_tree_example.py b/src/cython/example/simplex_tree_example.py
index bf5f17a2..3af20fcf 100755
--- a/src/cython/example/simplex_tree_example.py
+++ b/src/cython/example/simplex_tree_example.py
@@ -61,6 +61,6 @@ print("filtration[4, 2]=", st.filtration([4, 2]))
 print("num_simplices=", st.num_simplices())
 print("num_vertices=", st.num_vertices())
 
-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("skeleton[2]=", st.get_skeleton(2))
+print("skeleton[1]=", st.get_skeleton(1))
+print("skeleton[0]=", st.get_skeleton(0))