Fix examples and tests

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

Former-commit-id: 4a1c78aec05d443e0525bf24a0cc7f7b5c628629

5 files changed, 9 insertions, 60 deletions

diff --git a/src/Rips_complex/example/CMakeLists.txt b/src/Rips_complex/example/CMakeLists.txt
index 9ba9d941..c15a13d0 100644
--- a/src/Rips_complex/example/CMakeLists.txt
+++ b/src/Rips_complex/example/CMakeLists.txt
@@ -32,19 +32,17 @@ add_test(ripsoffreader_doc_12_1 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader alphac
 add_test(ripsoffreader_doc_12_3 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader alphacomplexdoc.off 12.0 3 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_3.txt)
 
 file(COPY "${CMAKE_SOURCE_DIR}/data/distance_matrix/full_square_distance_matrix.csv" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-add_test(ripscsvdistancereader_doc_1_1 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvdistancereader full_square_distance_matrix.csv 1.0 1 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_1_1.txt)
-add_test(ripscsvdistancereader_doc_1_3 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvdistancereader full_square_distance_matrix.csv 1.0 3 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_1_3.txt)
+add_test(ripscsvdistancereader_doc_12_1 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvdistancereader full_square_distance_matrix.csv 12.0 1 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_1.txt)
+add_test(ripscsvdistancereader_doc_12_3 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvdistancereader full_square_distance_matrix.csv 12.0 3 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_3.txt)
 
 
 if (DIFF_PATH)
   # Do not forget to copy test results files in current binary dir
-  file(COPY "one_skeleton_rips_points_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-  file(COPY "full_skeleton_rips_points_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-  file(COPY "one_skeleton_rips_distance_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-  file(COPY "full_skeleton_rips_distance_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-
-  add_test(ripsoffreader_doc_12_1_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_1.txt ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_points_for_doc.txt)
-  add_test(ripsoffreader_doc_12_3_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_3.txt ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_points_for_doc.txt)
-  add_test(ripscsvreader_doc_1_1_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_1_1.txt ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_distance_for_doc.txt)
-  add_test(ripscsvreader_doc_1_3_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_1_3.txt ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_distance_for_doc.txt)
+  file(COPY "one_skeleton_rips_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+  file(COPY "full_skeleton_rips_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+
+  add_test(ripsoffreader_doc_12_1_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_1.txt ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_for_doc.txt)
+  add_test(ripsoffreader_doc_12_3_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_3.txt ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_for_doc.txt)
+  add_test(ripscsvreader_doc_12_1_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_1.txt ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_for_doc.txt)
+  add_test(ripscsvreader_doc_12_3_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_3.txt ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_for_doc.txt)
 endif()
diff --git a/src/Rips_complex/example/full_skeleton_rips_distance_for_doc.txt b/src/Rips_complex/example/full_skeleton_rips_distance_for_doc.txt
deleted file mode 100644
index 6744532d..00000000
--- a/src/Rips_complex/example/full_skeleton_rips_distance_for_doc.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Rips complex is of dimension 3 - 30 simplices - 5 vertices.
-Iterator on rips complex simplices in the filtration order, with [filtration value]:
-   ( 0 ) -> [0] 
-   ( 1 ) -> [0] 
-   ( 2 ) -> [0] 
-   ( 3 ) -> [0] 
-   ( 4 ) -> [0] 
-   ( 4 0 ) -> [0.11] 
-   ( 2 1 ) -> [0.26] 
-   ( 3 2 ) -> [0.28] 
-   ( 4 3 ) -> [0.3] 
-   ( 4 1 ) -> [0.39] 
-   ( 2 0 ) -> [0.77] 
-   ( 1 0 ) -> [0.94] 
-   ( 2 1 0 ) -> [0.94] 
-   ( 4 1 0 ) -> [0.94] 
-   ( 4 2 ) -> [0.97] 
-   ( 4 2 0 ) -> [0.97] 
-   ( 4 2 1 ) -> [0.97] 
-   ( 4 2 1 0 ) -> [0.97] 
-   ( 4 3 2 ) -> [0.97] 
-   ( 3 0 ) -> [0.99] 
-   ( 3 1 ) -> [0.99] 
-   ( 3 1 0 ) -> [0.99] 
-   ( 3 2 0 ) -> [0.99] 
-   ( 3 2 1 ) -> [0.99] 
-   ( 3 2 1 0 ) -> [0.99] 
-   ( 4 3 0 ) -> [0.99] 
-   ( 4 3 1 ) -> [0.99] 
-   ( 4 3 1 0 ) -> [0.99] 
-   ( 4 3 2 0 ) -> [0.99] 
-   ( 4 3 2 1 ) -> [0.99] 
diff --git a/src/Rips_complex/example/full_skeleton_rips_points_for_doc.txt b/src/Rips_complex/example/full_skeleton_rips_for_doc.txt
index 319931e0..319931e0 100644
--- a/src/Rips_complex/example/full_skeleton_rips_points_for_doc.txt
+++ b/src/Rips_complex/example/full_skeleton_rips_for_doc.txt
diff --git a/src/Rips_complex/example/one_skeleton_rips_distance_for_doc.txt b/src/Rips_complex/example/one_skeleton_rips_distance_for_doc.txt
deleted file mode 100644
index 9bb1a7ab..00000000
--- a/src/Rips_complex/example/one_skeleton_rips_distance_for_doc.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Rips complex is of dimension 1 - 15 simplices - 5 vertices.
-Iterator on rips complex simplices in the filtration order, with [filtration value]:
-   ( 0 ) -> [0] 
-   ( 1 ) -> [0] 
-   ( 2 ) -> [0] 
-   ( 3 ) -> [0] 
-   ( 4 ) -> [0] 
-   ( 4 0 ) -> [0.11] 
-   ( 2 1 ) -> [0.26] 
-   ( 3 2 ) -> [0.28] 
-   ( 4 3 ) -> [0.3] 
-   ( 4 1 ) -> [0.39] 
-   ( 2 0 ) -> [0.77] 
-   ( 1 0 ) -> [0.94] 
-   ( 4 2 ) -> [0.97] 
-   ( 3 0 ) -> [0.99] 
-   ( 3 1 ) -> [0.99] 
diff --git a/src/Rips_complex/example/one_skeleton_rips_points_for_doc.txt b/src/Rips_complex/example/one_skeleton_rips_for_doc.txt
index b0e25cc5..b0e25cc5 100644
--- a/src/Rips_complex/example/one_skeleton_rips_points_for_doc.txt
+++ b/src/Rips_complex/example/one_skeleton_rips_for_doc.txt