Merge last trunk modifications

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

Former-commit-id: 213c7b76c5f8c3248b24a2ac9250ed59034d8076

1 files changed, 8 insertions, 7 deletions

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 3baebd17..4d2ed577 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
@@ -9,7 +9,7 @@ import argparse
 
    Author(s):       Vincent Rouvreau
 
-   Copyright (C) 2016 INRIA
+   Copyright (C) 2016 Inria
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,20 +26,20 @@ import argparse
 """
 
 __author__ = "Vincent Rouvreau"
-__copyright__ = "Copyright (C) 2016 INRIA"
+__copyright__ = "Copyright (C) 2016 Inria"
 __license__ = "GPL v3"
 
 parser = argparse.ArgumentParser(description='RipsComplex creation from '
-                                 'a distance matrix read in a OFF file.',
+                                 'a distance matrix read in a csv file.',
                                  epilog='Example: '
                                  'example/rips_complex_diagram_persistence_from_distance_matrix_file_example.py '
                                  '-f ../data/distance_matrix/lower_triangular_distance_matrix.csv -e 12.0 -d 3'
                                  '- Constructs a Rips complex with the '
-                                 'points from the given OFF file.')
+                                 'distance matrix from the given csv file.')
 parser.add_argument("-f", "--file", type=str, required=True)
 parser.add_argument("-e", "--max_edge_length", type=float, default=0.5)
 parser.add_argument("-d", "--max_dimension", type=int, default=1)
-parser.add_argument("-b", "--band_boot", type=float, default=0.)
+parser.add_argument("-b", "--band", type=float, default=0.)
 parser.add_argument('--no-diagram', default=False, action='store_true' , help='Flag for not to display the diagrams')
 
 args = parser.parse_args()
@@ -50,7 +50,8 @@ print("RipsComplex creation from distance matrix read in a csv file")
 message = "RipsComplex with max_edge_length=" + repr(args.max_edge_length)
 print(message)
 
-rips_complex = gudhi.RipsComplex(csv_file=args.file, max_edge_length=args.max_edge_length)
+distance_matrix = gudhi.read_lower_triangular_matrix_from_csv_file(csv_file=args.file)
+rips_complex = gudhi.RipsComplex(distance_matrix=distance_matrix, max_edge_length=args.max_edge_length)
 simplex_tree = rips_complex.create_simplex_tree(max_dimension=args.max_dimension)
 
 message = "Number of simplices=" + repr(simplex_tree.num_simplices())
@@ -62,5 +63,5 @@ print("betti_numbers()=")
 print(simplex_tree.betti_numbers())
 
 if args.no_diagram == False:
-    pplot = gudhi.plot_persistence_diagram(diag, band_boot=args.band_boot)
+    pplot = gudhi.plot_persistence_diagram(diag, band=args.band)
     pplot.show()