From b987fc9acca83d8a0dca40647cfe804edfcee2a7 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 16 Jan 2017 09:43:21 +0000 Subject: Remove the usage functions and modified the doc for oneskeletonripspoints and oneskeletonripsdistance. No added value as distance matrix and points set is hard defined. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1939 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 13142245f95995a13c5bf484a6f8bf5d4bf53b58 --- src/Rips_complex/doc/Intro_rips_complex.h | 6 +++--- src/Rips_complex/example/CMakeLists.txt | 5 ++--- .../example_one_skeleton_rips_from_distance_matrix.cpp | 14 ++------------ .../example/example_one_skeleton_rips_from_points.cpp | 14 ++------------ 4 files changed, 9 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/Rips_complex/doc/Intro_rips_complex.h b/src/Rips_complex/doc/Intro_rips_complex.h index 8bacd0e7..64fd34bc 100644 --- a/src/Rips_complex/doc/Intro_rips_complex.h +++ b/src/Rips_complex/doc/Intro_rips_complex.h @@ -69,9 +69,9 @@ namespace rips_complex { * \include Rips_complex/example_one_skeleton_rips_from_points.cpp * * When launching (rips maximal distance between 2 points is 12.0, is expanded until dimension 1 - one skeleton graph - * with other words): + * in other words): * - * \code $> ./oneskeletonripspoints 12.0 + * \code $> ./oneskeletonripspoints * \endcode * * the program output is: @@ -114,7 +114,7 @@ namespace rips_complex { * When launching (rips maximal distance between 2 points is 1.0, is expanded until dimension 1 - one skeleton graph * with other words): * - * \code $> ./oneskeletonripsdistance 1.0 + * \code $> ./oneskeletonripsdistance * \endcode * * the program output is: diff --git a/src/Rips_complex/example/CMakeLists.txt b/src/Rips_complex/example/CMakeLists.txt index c15a13d0..070ac710 100644 --- a/src/Rips_complex/example/CMakeLists.txt +++ b/src/Rips_complex/example/CMakeLists.txt @@ -22,9 +22,8 @@ if (TBB_FOUND) target_link_libraries(ripscsvdistancereader ${TBB_LIBRARIES}) endif() -add_test(oneskeletonripspoints ${CMAKE_CURRENT_BINARY_DIR}/oneskeletonripspoints 12.0) - -add_test(oneskeletonripsdistance ${CMAKE_CURRENT_BINARY_DIR}/oneskeletonripspoints 1.0) +add_test(oneskeletonripspoints ${CMAKE_CURRENT_BINARY_DIR}/oneskeletonripspoints) +add_test(oneskeletonripsdistance ${CMAKE_CURRENT_BINARY_DIR}/oneskeletonripsdistance) # Do not forget to copy test files in current binary dir file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp index 326ad52f..765d65ea 100644 --- a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp +++ b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp @@ -7,18 +7,7 @@ #include #include // for std::numeric_limits -void usage(int nbArgs, char * const progName) { - std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n"; - std::cerr << "Usage: " << progName << " threshold\n"; - std::cerr << " i.e.: " << progName << " 12.0\n"; - exit(-1); // ----- >> -} - -int main(int argc, char **argv) { - if (argc != 2) usage(argc, argv[0]); - - double threshold = atof(argv[1]); - +int main() { // Type definitions using Simplex_tree = Gudhi::Simplex_tree; using Filtration_value = Simplex_tree::Filtration_value; @@ -42,6 +31,7 @@ int main(int argc, char **argv) { // ---------------------------------------------------------------------------- // Init of a rips complex from points // ---------------------------------------------------------------------------- + double threshold = 1.0; Rips_complex rips_complex_from_points(distances, threshold); Simplex_tree stree; diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp index 6e8dee27..5d1216a0 100644 --- a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp +++ b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp @@ -7,18 +7,7 @@ #include #include // for std::numeric_limits -void usage(int nbArgs, char * const progName) { - std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n"; - std::cerr << "Usage: " << progName << " threshold\n"; - std::cerr << " i.e.: " << progName << " 12.0\n"; - exit(-1); // ----- >> -} - -int main(int argc, char **argv) { - if (argc != 2) usage(argc, argv[0]); - - double threshold = atof(argv[1]); - +int main() { // Type definitions using Point = std::vector; using Simplex_tree = Gudhi::Simplex_tree; @@ -37,6 +26,7 @@ int main(int argc, char **argv) { // ---------------------------------------------------------------------------- // Init of a rips complex from points // ---------------------------------------------------------------------------- + double threshold = 12.0; Rips_complex rips_complex_from_points(points, threshold, Euclidean_distance()); Simplex_tree stree; -- cgit v1.2.3