Fix Windows python module compilation

rips_complex_diagram_persistence_from_distance_matrix_file_example.py shall use csv_file instead of off_file


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

Former-commit-id: b73613ce923e4bb72f5eae110cf290dc2215994d

1 files changed, 19 insertions, 26 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 664eb5c4..984dbf1b 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
@@ -43,29 +43,22 @@ parser.add_argument('--no-diagram', default=False, action='store_true' , help='F
 
 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("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(off_file=args.file, 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())
-        print(message)
-        
-        diag = simplex_tree.persistence()
-    
-        print("betti_numbers()=")
-        print(simplex_tree.betti_numbers())
-    
-        if args.no_diagram == False:
-            gudhi.plot_persistence_diagram(diag)
-    else:
-        print(args.file, "is not a valid OFF file")
-
-    f.close()
+print("#####################################################################")
+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)
+simplex_tree = rips_complex.create_simplex_tree(max_dimension=args.max_dimension)
+
+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)