1 files changed, 24 insertions, 36 deletions
diff --git a/src/python/example/alpha_complex_diagram_persistence_from_off_file_example.py b/src/python/example/alpha_complex_diagram_persistence_from_off_file_example.py
index 727af4fa..c96121a6 100755
--- a/src/python/example/alpha_complex_diagram_persistence_from_off_file_example.py
+++ b/src/python/example/alpha_complex_diagram_persistence_from_off_file_example.py
@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 
 import argparse
-import errno
-import os
-import matplotlib.pyplot as plot
-import gudhi
+import gudhi as gd
 
 """ This file is part of the Gudhi Library - https://gudhi.inria.fr/ -
     which is released under MIT.
@@ -26,12 +23,12 @@ parser = argparse.ArgumentParser(
     description="AlphaComplex creation from " "points read in a OFF file.",
     epilog="Example: "
     "example/alpha_complex_diagram_persistence_from_off_file_example.py "
-    "-f ../data/points/tore3D_300.off -a 0.6"
+    "-f ../data/points/tore3D_300.off"
     "- Constructs a alpha complex with the "
     "points from the given OFF file.",
 )
 parser.add_argument("-f", "--file", type=str, required=True)
-parser.add_argument("-a", "--max_alpha_square", type=float, default=0.5)
+parser.add_argument("-a", "--max_alpha_square", type=float, required=False)
 parser.add_argument("-b", "--band", type=float, default=0.0)
 parser.add_argument(
     "--no-diagram",
@@ -42,33 +39,24 @@ parser.add_argument(
 
 args = parser.parse_args()
 
-with open(args.file, "r") as f:
-    first_line = f.readline()
-    if (first_line == "OFF\n") or (first_line == "nOFF\n"):
-        print("##############################################################")
-        print("AlphaComplex creation from points read in a OFF file")
-
-        message = "AlphaComplex with max_edge_length=" + repr(args.max_alpha_square)
-        print(message)
-
-        alpha_complex = gudhi.AlphaComplex(off_file=args.file)
-        simplex_tree = alpha_complex.create_simplex_tree(
-            max_alpha_square=args.max_alpha_square
-        )
-
-        message = "Number of simplices=" + repr(simplex_tree.num_simplices())
-        print(message)
-
-        diag = simplex_tree.persistence()
-
-        print("betti_numbers()=")
-        print(simplex_tree.betti_numbers())
-
-        if args.no_diagram == False:
-            gudhi.plot_persistence_diagram(diag, band=args.band)
-            plot.show()
-    else:
-        raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT),
-                                args.file)
-
-    f.close()
+print("##############################################################")
+print("AlphaComplex creation from points read in a OFF file")
+
+points = gd.read_points_from_off_file(off_file = args.file)
+alpha_complex = gd.AlphaComplex(points = points)
+if args.max_alpha_square is not None:
+    print("with max_edge_length=", args.max_alpha_square)
+    simplex_tree = alpha_complex.create_simplex_tree(
+        max_alpha_square=args.max_alpha_square
+    )
+else:
+    simplex_tree = alpha_complex.create_simplex_tree()
+
+print("Number of simplices=", simplex_tree.num_simplices())
+
+diag = simplex_tree.persistence()
+print("betti_numbers()=", simplex_tree.betti_numbers())
+if args.no_diagram == False:
+    import matplotlib.pyplot as plot
+    gd.plot_persistence_diagram(diag, band=args.band)
+    plot.show()