Merge last trunk modifications

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

Former-commit-id: 3d0a3b2988bbbd0baa19fc09ba77e4e58e330a89

1 files changed, 52 insertions, 52 deletions

diff --git a/src/cython/doc/alpha_complex_user.rst b/src/cython/doc/alpha_complex_user.rst
index 2356944d..e8268ef1 100644
--- a/src/cython/doc/alpha_complex_user.rst
+++ b/src/cython/doc/alpha_complex_user.rst
@@ -1,4 +1,3 @@
-=========================
 Alpha complex user manual
 =========================
 Definition
@@ -30,39 +29,40 @@ This example builds the Delaunay triangulation from the given points, and initia
         repr(simplex_tree.num_simplices()) + ' simplices - ' + \
         repr(simplex_tree.num_vertices()) + ' vertices.'
     print(result_str)
+    fmt = '%s -> %.2f'
     for filtered_value in simplex_tree.get_filtration():
-        print(filtered_value)
+        print(fmt % tuple(filtered_value))
 
 The output is:
 
 .. testoutput::
 
    Alpha complex is of dimension 2 - 25 simplices - 7 vertices.
-   ([0], 0.0)
-   ([1], 0.0)
-   ([2], 0.0)
-   ([3], 0.0)
-   ([4], 0.0)
-   ([5], 0.0)
-   ([6], 0.0)
-   ([2, 3], 6.25)
-   ([4, 5], 7.25)
-   ([0, 2], 8.5)
-   ([0, 1], 9.25)
-   ([1, 3], 10.0)
-   ([1, 2], 11.25)
-   ([1, 2, 3], 12.5)
-   ([0, 1, 2], 12.995867768595042)
-   ([5, 6], 13.25)
-   ([2, 4], 20.0)
-   ([4, 6], 22.736686390532547)
-   ([4, 5, 6], 22.736686390532547)
-   ([3, 6], 30.25)
-   ([2, 6], 36.5)
-   ([2, 3, 6], 36.5)
-   ([2, 4, 6], 37.24489795918368)
-   ([0, 4], 59.710743801652896)
-   ([0, 2, 4], 59.710743801652896)
+   [0] -> 0.00
+   [1] -> 0.00
+   [2] -> 0.00
+   [3] -> 0.00
+   [4] -> 0.00
+   [5] -> 0.00
+   [6] -> 0.00
+   [2, 3] -> 6.25
+   [4, 5] -> 7.25
+   [0, 2] -> 8.50
+   [0, 1] -> 9.25
+   [1, 3] -> 10.00
+   [1, 2] -> 11.25
+   [1, 2, 3] -> 12.50
+   [0, 1, 2] -> 13.00
+   [5, 6] -> 13.25
+   [2, 4] -> 20.00
+   [4, 6] -> 22.74
+   [4, 5, 6] -> 22.74
+   [3, 6] -> 30.25
+   [2, 6] -> 36.50
+   [2, 3, 6] -> 36.50
+   [2, 4, 6] -> 37.24
+   [0, 4] -> 59.71
+   [0, 2, 4] -> 59.71
 
 
 Algorithm
@@ -164,39 +164,39 @@ Then, it is asked to display information about the alpha complex:
         repr(simplex_tree.num_simplices()) + ' simplices - ' + \
         repr(simplex_tree.num_vertices()) + ' vertices.'
     print(result_str)
+    fmt = '%s -> %.2f'
     for filtered_value in simplex_tree.get_filtration():
-        print(filtered_value)
+        print(fmt % tuple(filtered_value))
 
 the program output is:
 
 .. testoutput::
 
    Alpha complex is of dimension 2 - 23 simplices - 7 vertices.
-   ([0], 0.0)
-   ([1], 0.0)
-   ([2], 0.0)
-   ([3], 0.0)
-   ([4], 0.0)
-   ([5], 0.0)
-   ([6], 0.0)
-   ([2, 3], 6.25)
-   ([4, 5], 7.25)
-   ([0, 2], 8.5)
-   ([0, 1], 9.25)
-   ([1, 3], 10.0)
-   ([1, 2], 11.25)
-   ([1, 2, 3], 12.5)
-   ([0, 1, 2], 12.995867768595042)
-   ([5, 6], 13.25)
-   ([2, 4], 20.0)
-   ([4, 6], 22.736686390532547)
-   ([4, 5, 6], 22.736686390532547)
-   ([3, 6], 30.25)
-   ([2, 6], 36.5)
-   ([2, 3, 6], 36.5)
-   ([2, 4, 6], 37.24489795918368)
+   [0] -> 0.00
+   [1] -> 0.00
+   [2] -> 0.00
+   [3] -> 0.00
+   [4] -> 0.00
+   [5] -> 0.00
+   [6] -> 0.00
+   [2, 3] -> 6.25
+   [4, 5] -> 7.25
+   [0, 2] -> 8.50
+   [0, 1] -> 9.25
+   [1, 3] -> 10.00
+   [1, 2] -> 11.25
+   [1, 2, 3] -> 12.50
+   [0, 1, 2] -> 13.00
+   [5, 6] -> 13.25
+   [2, 4] -> 20.00
+   [4, 6] -> 22.74
+   [4, 5, 6] -> 22.74
+   [3, 6] -> 30.25
+   [2, 6] -> 36.50
+   [2, 3, 6] -> 36.50
+   [2, 4, 6] -> 37.24
 
-==============
 CGAL citations
 ==============