Add example rips_complex_from_file_example.py to compare with alpha complex.

Modify existing examples.


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

Former-commit-id: df5ac5ac6ad0427d9f943a632b36802581043760

3 files changed, 65 insertions, 1 deletions

diff --git a/src/cython/example/alpha_complex_from_file_example.py b/src/cython/example/alpha_complex_from_file_example.py
index da7ae857..d1040e83 100755
--- a/src/cython/example/alpha_complex_from_file_example.py
+++ b/src/cython/example/alpha_complex_from_file_example.py
@@ -46,6 +46,8 @@ args = parser.parse_args()
 
 points = pandas.read_csv(args.file, header=None)
 
+print("AlphaComplex with max_alpha_square=0.5")
+
 alpha_complex = gudhi.AlphaComplex(points=points.values,
                                    max_alpha_square=0.5)
 
diff --git a/src/cython/example/rips_complex_from_file_example.py b/src/cython/example/rips_complex_from_file_example.py
new file mode 100755
index 00000000..1831a5e9
--- /dev/null
+++ b/src/cython/example/rips_complex_from_file_example.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+
+import gudhi
+import pandas
+import argparse
+
+"""This file is part of the Gudhi Library. The Gudhi library
+   (Geometric Understanding in Higher Dimensions) is a generic C++
+   library for computational topology.
+
+   Author(s):       Vincent Rouvreau
+
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+__author__ = "Vincent Rouvreau"
+__copyright__ = "Copyright (C) 2016 INRIA"
+__license__ = "GPL v3"
+
+print("#####################################################################")
+print("RipsComplex creation from points read in a file")
+
+parser = argparse.ArgumentParser(description='RipsComplex creation from '
+                                 'points read in a file.',
+                                 epilog='Example: '
+                                 'example/rips_complex_from_file_example.py '
+                                 'data/500_random_points_on_3D_Torus.csv '
+                                 '- Constructs a rips complex with the '
+                                 'points from the given file. File format '
+                                 'is X1, X2, ..., Xn')
+parser.add_argument('file', type=argparse.FileType('r'))
+args = parser.parse_args()
+
+points = pandas.read_csv(args.file, header=None)
+
+print("RipsComplex with max_edge_length=1.9")
+
+rips_complex = gudhi.RipsComplex(points=points.values,
+                                 max_dimension=len(points.values[0]), max_edge_length=1.9)
+
+rips_complex.initialize_filtration()
+diag = rips_complex.persistence(homology_coeff_field=2, min_persistence=0.1)
+
+print("betti_numbers()=")
+print(rips_complex.betti_numbers())
+
+gudhi.diagram_persistence(diag)
+
+gudhi.bar_code_persistence(diag)
diff --git a/src/cython/example/rips_persistence_diagram.py b/src/cython/example/rips_persistence_diagram.py
index 57f25b22..fddea298 100755
--- a/src/cython/example/rips_persistence_diagram.py
+++ b/src/cython/example/rips_persistence_diagram.py
@@ -36,4 +36,4 @@ rips = gudhi.RipsComplex(points=[[0, 0], [1, 0], [0, 1], [1, 1]],
 diag = rips.persistence(homology_coeff_field=2, min_persistence=0)
 print("diag=", diag)
 
-gudhi.bar_code_persistence(diag)
+gudhi.diagram_persistence(diag)