summaryrefslogtreecommitdiff
path: root/src/Rips_complex/example
diff options
context:
space:
mode:
Diffstat (limited to 'src/Rips_complex/example')
-rw-r--r--src/Rips_complex/example/CMakeLists.txt21
-rw-r--r--src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp (renamed from src/Rips_complex/example/example_rips_complex_from_points.cpp)19
-rw-r--r--src/Rips_complex/example/full_skeleton_rips_points_for_doc.txt (renamed from src/Rips_complex/example/rips_points_for_doc_12_3.txt)0
-rw-r--r--src/Rips_complex/example/one_skeleton_rips_points_for_doc.txt (renamed from src/Rips_complex/example/rips_points_for_doc_12_1.txt)0
4 files changed, 24 insertions, 16 deletions
diff --git a/src/Rips_complex/example/CMakeLists.txt b/src/Rips_complex/example/CMakeLists.txt
index f8dcf94d..3962b15e 100644
--- a/src/Rips_complex/example/CMakeLists.txt
+++ b/src/Rips_complex/example/CMakeLists.txt
@@ -3,12 +3,25 @@ project(Rips_complex_examples)
add_executable ( ripsoffreader example_rips_complex_from_off_file.cpp )
target_link_libraries(ripsoffreader ${Boost_SYSTEM_LIBRARY})
+
+add_executable ( oneskeletonripspoints example_one_skeleton_rips_from_points.cpp )
+target_link_libraries(oneskeletonripspoints ${Boost_SYSTEM_LIBRARY})
+
if (TBB_FOUND)
target_link_libraries(ripsoffreader ${TBB_LIBRARIES})
+ target_link_libraries(oneskeletonripspoints ${TBB_LIBRARIES})
endif()
-add_executable ( ripspoints example_rips_complex_from_points.cpp )
-target_link_libraries(ripspoints ${Boost_SYSTEM_LIBRARY})
-if (TBB_FOUND)
- target_link_libraries(ripspoints ${TBB_LIBRARIES})
+add_test(oneskeletonripspoints ${CMAKE_CURRENT_BINARY_DIR}/oneskeletonripspoints 12.0)
+# 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}/)
+add_test(ripsoffreader_doc_12_1 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader alphacomplexdoc.off 12.0 1 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_1.txt)
+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)
+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}/)
+
+ 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)
endif()
diff --git a/src/Rips_complex/example/example_rips_complex_from_points.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
index c241d137..db41b425 100644
--- a/src/Rips_complex/example/example_rips_complex_from_points.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
@@ -11,20 +11,15 @@
void usage(int nbArgs, char * const progName) {
std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
- std::cerr << "Usage: " << progName << " dim_max [threshold]\n";
- std::cerr << " i.e.: " << progName << " 3 12.0\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) && (argc != 3)) usage(argc, argv[0]);
+ if (argc != 2) usage(argc, argv[0]);
- double threshold = std::numeric_limits<double>::infinity();
- int dim_max = atoi(argv[1]);
-
- if (argc == 3) {
- threshold = atof(argv[2]);
- }
+ double threshold = atof(argv[1]);
// Type definitions
using Point = std::vector<double>;
@@ -41,14 +36,14 @@ int main(int argc, char **argv) {
points.push_back({9.0, 17.0});
// ----------------------------------------------------------------------------
- // Init of a rips complex from an OFF file
+ // Init of a rips complex from points
// ----------------------------------------------------------------------------
Rips_complex rips_complex_from_file(points, threshold, euclidean_distance<Point>);
Simplex_tree simplex;
- if (rips_complex_from_file.create_complex(simplex, dim_max)) {
+ if (rips_complex_from_file.create_complex(simplex, 1)) {
// ----------------------------------------------------------------------------
- // Display information about the rips complex
+ // Display information about the one skeleton rips complex
// ----------------------------------------------------------------------------
std::cout << "Rips complex is of dimension " << simplex.dimension() <<
" - " << simplex.num_simplices() << " simplices - " <<
diff --git a/src/Rips_complex/example/rips_points_for_doc_12_3.txt b/src/Rips_complex/example/full_skeleton_rips_points_for_doc.txt
index 319931e0..319931e0 100644
--- a/src/Rips_complex/example/rips_points_for_doc_12_3.txt
+++ b/src/Rips_complex/example/full_skeleton_rips_points_for_doc.txt
diff --git a/src/Rips_complex/example/rips_points_for_doc_12_1.txt b/src/Rips_complex/example/one_skeleton_rips_points_for_doc.txt
index b0e25cc5..b0e25cc5 100644
--- a/src/Rips_complex/example/rips_points_for_doc_12_1.txt
+++ b/src/Rips_complex/example/one_skeleton_rips_points_for_doc.txt