diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-22 13:29:59 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-22 13:29:59 +0000 |
commit | 71f9bed6df48dedc0d4e8ef620496af9c494eccc (patch) | |
tree | 0e785bcac501fb4d1507640dca06ab0bd47f4a7a /src/Rips_complex | |
parent | 1a728400187d89db914e865a979c85c7260b0b02 (diff) |
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
Diffstat (limited to 'src/Rips_complex')
-rw-r--r-- | src/Rips_complex/doc/Intro_rips_complex.h | 8 | ||||
-rw-r--r-- | src/Rips_complex/example/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/Rips_complex/example/full_skeleton_rips_distance_for_doc.txt | 32 | ||||
-rw-r--r-- | src/Rips_complex/example/full_skeleton_rips_for_doc.txt (renamed from src/Rips_complex/example/full_skeleton_rips_points_for_doc.txt) | 0 | ||||
-rw-r--r-- | src/Rips_complex/example/one_skeleton_rips_distance_for_doc.txt | 17 | ||||
-rw-r--r-- | src/Rips_complex/example/one_skeleton_rips_for_doc.txt (renamed from src/Rips_complex/example/one_skeleton_rips_points_for_doc.txt) | 0 |
6 files changed, 13 insertions, 64 deletions
diff --git a/src/Rips_complex/doc/Intro_rips_complex.h b/src/Rips_complex/doc/Intro_rips_complex.h index d01b14bb..0ae89ffc 100644 --- a/src/Rips_complex/doc/Intro_rips_complex.h +++ b/src/Rips_complex/doc/Intro_rips_complex.h @@ -73,7 +73,7 @@ namespace rips_complex { * * the program output is: * - * \include Rips_complex/one_skeleton_rips_points_for_doc.txt + * \include Rips_complex/one_skeleton_rips_for_doc.txt * * \subsection ripsoffexample Example from OFF file * @@ -93,7 +93,7 @@ namespace rips_complex { * * the program output is: * - * \include Rips_complex/full_skeleton_rips_points_for_doc.txt + * \include Rips_complex/full_skeleton_rips_for_doc.txt * * * @@ -116,7 +116,7 @@ namespace rips_complex { * * the program output is: * - * \include Rips_complex/one_skeleton_rips_distance_for_doc.txt + * \include Rips_complex/one_skeleton_rips_for_doc.txt * * \subsection ripscsvdistanceexample Example from a distance matrix read in a csv file * @@ -135,7 +135,7 @@ namespace rips_complex { * * the program output is: * - * \include Rips_complex/full_skeleton_rips_distance_for_doc.txt + * \include Rips_complex/full_skeleton_rips_for_doc.txt * * \copyright GNU General Public License v3. * \verbatim Contact: gudhi-users@lists.gforge.inria.fr \endverbatim 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 |