From 5de02a8e89ce7905281a0ef6d40f82ef04d426d6 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 30 May 2017 11:14:43 +0000 Subject: Typo git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representation_integration@2472 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 457b970258b8a99519db664358c19d0dee80d879 --- .../utilities/persistence_intervals/CMakeLists.txt | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt (limited to 'src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt') diff --git a/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt new file mode 100644 index 00000000..b5c5928d --- /dev/null +++ b/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 2.6) +project(GUDHI_STAT) + +#persitence diagrams +add_executable ( plot_persistence_intervals plot_persistence_intervals.cpp ) +target_link_libraries( plot_persistence_intervals ${Boost_SYSTEM_LIBRARY}) +add_test ( plot_persistence_intervals ${CMAKE_CURRENT_BINARY_DIR}/plot_persistence_intervals "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_executable ( compute_birth_death_range_in_persistence_diagram compute_birth_death_range_in_persistence_diagram.cpp ) +target_link_libraries( compute_birth_death_range_in_persistence_diagram ${Boost_SYSTEM_LIBRARY}) +add_test ( compute_birth_death_range_in_persistence_diagram ${CMAKE_CURRENT_BINARY_DIR}/compute_birth_death_range_in_persistence_diagram -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_executable ( compute_number_of_dominant_intervals compute_number_of_dominant_intervals.cpp ) +target_link_libraries( compute_number_of_dominant_intervals ${Boost_SYSTEM_LIBRARY}) +add_test ( compute_number_of_dominant_intervals ${CMAKE_CURRENT_BINARY_DIR}/compute_number_of_dominant_intervals "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" -1 2 ) + +add_executable ( plot_histogram_of_intervals_lengths plot_histogram_of_intervals_lengths.cpp ) +target_link_libraries( plot_histogram_of_intervals_lengths ${Boost_SYSTEM_LIBRARY}) +add_test ( plot_histogram_of_intervals_lengths ${CMAKE_CURRENT_BINARY_DIR}/plot_histogram_of_intervals_lengths "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" 2 ) + +add_executable ( plot_persistence_Betti_numbers plot_persistence_Betti_numbers.cpp ) +target_link_libraries( plot_persistence_Betti_numbers ${Boost_SYSTEM_LIBRARY}) +add_test ( plot_persistence_Betti_numbers ${CMAKE_CURRENT_BINARY_DIR}/plot_persistence_Betti_numbers "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) +add_executable ( compute_bottleneck_distance compute_bottleneck_distance.cpp ) +target_link_libraries( compute_bottleneck_distance ${Boost_SYSTEM_LIBRARY}) +if (TBB_FOUND) +target_link_libraries(compute_bottleneck_distance ${TBB_LIBRARIES}) +endif(TBB_FOUND) +add_test ( compute_bottleneck_distance ${CMAKE_CURRENT_BINARY_DIR}/compute_bottleneck_distance "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) +endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) -- cgit v1.2.3 From 82e2f453feae8011a529b0e932a7c2a2f6472f9d Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 6 Jun 2017 11:15:17 +0000 Subject: Make build out of source git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representation_integration@2513 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7b6b18858d5e71613c4c15c4c262b4c4b5a6ac8e --- .../example/CMakeLists.txt | 48 ++++++----- .../example/simple_diagram.txt | 4 - .../test/CMakeLists.txt | 98 +++++++--------------- .../utilities/persistence_heat_maps/CMakeLists.txt | 42 +++++++--- .../utilities/persistence_intervals/CMakeLists.txt | 40 ++++++--- .../persistence_landscapes/CMakeLists.txt | 28 +++++-- .../persistence_landscapes_on_grid/CMakeLists.txt | 29 +++++-- .../utilities/persistence_vectors/CMakeLists.txt | 29 +++++-- 8 files changed, 175 insertions(+), 143 deletions(-) delete mode 100644 src/Persistence_representations/example/simple_diagram.txt (limited to 'src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt') diff --git a/src/Persistence_representations/example/CMakeLists.txt b/src/Persistence_representations/example/CMakeLists.txt index 3357017a..7788b603 100644 --- a/src/Persistence_representations/example/CMakeLists.txt +++ b/src/Persistence_representations/example/CMakeLists.txt @@ -1,27 +1,33 @@ cmake_minimum_required(VERSION 2.6) project(Persistence_representations_example) -file(COPY "simple_diagram.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) - -add_executable ( persistence_landscape_on_grid persistence_landscape_on_grid.cpp ) -target_link_libraries(persistence_landscape_on_grid ${Boost_SYSTEM_LIBRARY}) -add_test ( persistence_landscape_on_grid ${CMAKE_CURRENT_BINARY_DIR}/persistence_landscape_on_grid ) - -add_executable ( persistence_landscape persistence_landscape.cpp ) -target_link_libraries(persistence_landscape ${Boost_SYSTEM_LIBRARY}) -add_test ( persistence_landscape ${CMAKE_CURRENT_BINARY_DIR}/persistence_landscape ) - -add_executable ( persistence_intervals persistence_intervals.cpp ) -target_link_libraries(persistence_intervals ${Boost_SYSTEM_LIBRARY}) -add_test ( persistence_intervals ${CMAKE_CURRENT_BINARY_DIR}/persistence_intervals simple_diagram.txt ) - -add_executable ( persistence_vectors persistence_vectors.cpp ) -target_link_libraries(persistence_vectors ${Boost_SYSTEM_LIBRARY}) -add_test ( persistence_vectors ${CMAKE_CURRENT_BINARY_DIR}/persistence_vectors ) - -add_executable ( persistence_heat_maps persistence_heat_maps.cpp ) -target_link_libraries(persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) -add_test ( persistence_heat_maps ${CMAKE_CURRENT_BINARY_DIR}/persistence_heat_maps ) +file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") + +add_executable ( Persistence_representations_example_landscape_on_grid persistence_landscape_on_grid.cpp ) +target_link_libraries(Persistence_representations_example_landscape_on_grid ${Boost_SYSTEM_LIBRARY}) +add_test(NAME Persistence_representations_example_landscape_on_grid + COMMAND $) + +add_executable ( Persistence_representations_example_landscape persistence_landscape.cpp ) +target_link_libraries(Persistence_representations_example_landscape ${Boost_SYSTEM_LIBRARY}) +add_test(NAME Persistence_representations_example_landscape + COMMAND $) + +add_executable ( Persistence_representations_example_intervals persistence_intervals.cpp ) +target_link_libraries(Persistence_representations_example_intervals ${Boost_SYSTEM_LIBRARY}) +add_test(NAME Persistence_representations_example_intervals + COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") + +add_executable ( Persistence_representations_example_vectors persistence_vectors.cpp ) +target_link_libraries(Persistence_representations_example_vectors ${Boost_SYSTEM_LIBRARY}) +add_test(NAME Persistence_representations_example_vectors + COMMAND $) + +add_executable ( Persistence_representations_example_heat_maps persistence_heat_maps.cpp ) +target_link_libraries(Persistence_representations_example_heat_maps ${Boost_SYSTEM_LIBRARY}) +add_test(NAME Persistence_representations_example_heat_maps + COMMAND $) diff --git a/src/Persistence_representations/example/simple_diagram.txt b/src/Persistence_representations/example/simple_diagram.txt deleted file mode 100644 index 2f199fd4..00000000 --- a/src/Persistence_representations/example/simple_diagram.txt +++ /dev/null @@ -1,4 +0,0 @@ -1 2 -3 4 -5 6 -7 8 \ No newline at end of file diff --git a/src/Persistence_representations/test/CMakeLists.txt b/src/Persistence_representations/test/CMakeLists.txt index 7b6de74e..4483de07 100644 --- a/src/Persistence_representations/test/CMakeLists.txt +++ b/src/Persistence_representations/test/CMakeLists.txt @@ -1,89 +1,47 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHI_STAT_CCUT) - -if (GCOVR_PATH) - # for gcovr to make coverage reports - Corbera Jenkins plugin - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") -endif() -if (GPROF_PATH) - # for gprof to make coverage reports - Jenkins - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pg") -endif() - -# copy data directory for tests purpose. QUESTION -- DOEST IT WORK IF WE CREATE A NEW FOLDER FOR EACH TEST? i THINK THAT WE SHOULD MAKE THS COPYING TO EACH TEST FOLDER. -file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) -add_executable ( persistence_intervals_test persistence_intervals_test.cpp ) -target_link_libraries(persistence_intervals_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) - +project(Persistence_representations_test) -# Unitary tests -add_test(NAME persistence_intervals_test - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/persistence_intervals_test - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/persistence_intervals_UT.xml --log_level=test_suite --report_level=no) +include(GUDHI_test_coverage) -add_executable ( vector_representation_test vector_representation_test.cpp ) -target_link_libraries(vector_representation_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +# copy data directory for tests purpose. +file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) +add_executable ( Persistence_intervals_test_unit persistence_intervals_test.cpp ) +target_link_libraries(Persistence_intervals_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -# Unitary tests -add_test(NAME vector_representation_test - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/vector_representation_test - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/vector_representation_UT.xml --log_level=test_suite --report_level=no) +gudhi_add_coverage_test(Persistence_intervals_test_unit) -add_executable ( persistence_lanscapes_test persistence_lanscapes_test.cpp ) -target_link_libraries(persistence_lanscapes_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +add_executable (Vector_representation_test_unit vector_representation_test.cpp ) +target_link_libraries(Vector_representation_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -# Unitary tests -add_test(NAME persistence_lanscapes_test - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/persistence_lanscapes_test - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/persistence_lanscapes_UT.xml --log_level=test_suite --report_level=no) +gudhi_add_coverage_test(Vector_representation_test_unit) -add_executable ( persistence_lanscapes_on_grid_test persistence_lanscapes_on_grid_test.cpp ) -target_link_libraries(persistence_lanscapes_on_grid_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +add_executable (Persistence_lanscapes_test_unit persistence_lanscapes_test.cpp ) +target_link_libraries(Persistence_lanscapes_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -# Unitary tests -add_test(NAME persistence_lanscapes_on_grid_test - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/persistence_lanscapes_on_grid_test - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/persistence_lanscapes_on_grid_UT.xml --log_level=test_suite --report_level=no) +gudhi_add_coverage_test(Persistence_lanscapes_test_unit) -add_executable ( persistence_heat_maps_test persistence_heat_maps_test.cpp ) -target_link_libraries(persistence_heat_maps_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +add_executable ( Persistence_lanscapes_on_grid_test_unit persistence_lanscapes_on_grid_test.cpp ) +target_link_libraries(Persistence_lanscapes_on_grid_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -# Unitary tests -add_test(NAME persistence_heat_maps_test - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/persistence_heat_maps_test - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/persistence_heat_maps_UT.xml --log_level=test_suite --report_level=no) +gudhi_add_coverage_test(Persistence_lanscapes_on_grid_test_unit) -add_executable ( read_persistence_from_file_test read_persistence_from_file_test.cpp ) -target_link_libraries(read_persistence_from_file_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +add_executable (Persistence_heat_maps_test_unit persistence_heat_maps_test.cpp ) +target_link_libraries(Persistence_heat_maps_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -# Unitary tests -add_test(NAME read_persistence_from_file_test - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/read_persistence_from_file_test - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/read_persistence_from_file_UT.xml --log_level=test_suite --report_level=no) +gudhi_add_coverage_test(Persistence_heat_maps_test_unit) +add_executable ( Read_persistence_from_file_test_unit read_persistence_from_file_test.cpp ) +target_link_libraries(Read_persistence_from_file_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +gudhi_add_coverage_test(Read_persistence_from_file_test_unit) if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) -add_executable ( persistence_intervals_with_distances_test persistence_intervals_with_distances_test.cpp ) -target_link_libraries(persistence_intervals_with_distances_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -if (TBB_FOUND) -target_link_libraries(persistence_intervals_with_distances_test ${TBB_LIBRARIES}) -endif(TBB_FOUND) -# Unitary tests -add_test(NAME persistence_intervals_with_distances_test - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/persistence_intervals_with_distances_test - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/persistence_intervals_with_distances_test_UT.xml --log_level=test_suite --report_level=no) + add_executable (Persistence_intervals_with_distances_test_unit persistence_intervals_with_distances_test.cpp ) + target_link_libraries(Persistence_intervals_with_distances_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) + if (TBB_FOUND) + target_link_libraries(Persistence_intervals_with_distances_test_unit ${TBB_LIBRARIES}) + endif(TBB_FOUND) + gudhi_add_coverage_test(Persistence_intervals_with_distances_test_unit) endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) diff --git a/src/Persistence_representations/utilities/persistence_heat_maps/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_heat_maps/CMakeLists.txt index 4ad924cb..0dd63852 100644 --- a/src/Persistence_representations/utilities/persistence_heat_maps/CMakeLists.txt +++ b/src/Persistence_representations/utilities/persistence_heat_maps/CMakeLists.txt @@ -1,41 +1,63 @@ cmake_minimum_required(VERSION 2.6) project(Persistence_representations_heat_maps_utilities) -#persitence heat maps +file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") add_executable ( create_persistence_heat_maps create_persistence_heat_maps.cpp ) target_link_libraries(create_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) -add_test ( create_persistence_heat_maps ${CMAKE_CURRENT_BINARY_DIR}/create_persistence_heat_maps 10 -1 -1 4 -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME create_persistence_heat_maps COMMAND $ + "10" "-1" "-1" "4" "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") + add_executable ( create_pssk create_pssk.cpp ) target_link_libraries(create_pssk ${Boost_SYSTEM_LIBRARY}) -add_test ( create_pssk ${CMAKE_CURRENT_BINARY_DIR}/create_pssk 10 -1 -1 4 -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME create_pssk COMMAND $ + "10" "-1" "-1" "4" "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( create_p_h_m_weighted_by_distance_from_diagonal create_p_h_m_weighted_by_distance_from_diagonal.cpp ) target_link_libraries(create_p_h_m_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY}) -add_test ( create_p_h_m_weighted_by_distance_from_diagonal ${CMAKE_CURRENT_BINARY_DIR}/create_p_h_m_weighted_by_distance_from_diagonal 10 -1 -1 4 -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME create_p_h_m_weighted_by_distance_from_diagonal COMMAND $ + "10" "-1" "-1" "4" "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( create_p_h_m_weighted_by_squared_diag_distance create_p_h_m_weighted_by_squared_diag_distance.cpp ) target_link_libraries(create_p_h_m_weighted_by_squared_diag_distance ${Boost_SYSTEM_LIBRARY}) -add_test (create_p_h_m_weighted_by_squared_diag_distance ${CMAKE_CURRENT_BINARY_DIR}/create_p_h_m_weighted_by_squared_diag_distance 10 -1 -1 4 -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME create_p_h_m_weighted_by_squared_diag_distance COMMAND $ + "10" "-1" "-1" "4" "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( create_p_h_m_weighted_by_arctan_of_their_persistence create_p_h_m_weighted_by_arctan_of_their_persistence.cpp ) target_link_libraries(create_p_h_m_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY}) -add_test ( create_p_h_m_weighted_by_arctan_of_their_persistence ${CMAKE_CURRENT_BINARY_DIR}/create_p_h_m_weighted_by_arctan_of_their_persistence 10 -1 -1 4 -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME create_p_h_m_weighted_by_arctan_of_their_persistence COMMAND $ + "10" "-1" "-1" "4" "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( average_persistence_heat_maps average_persistence_heat_maps.cpp ) target_link_libraries(average_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) -add_test ( average_persistence_heat_maps ${CMAKE_CURRENT_BINARY_DIR}/average_persistence_heat_maps "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME average_persistence_heat_maps COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( plot_persistence_heat_map plot_persistence_heat_map.cpp ) target_link_libraries(plot_persistence_heat_map ${Boost_SYSTEM_LIBRARY}) -add_test ( plot_persistence_heat_map ${CMAKE_CURRENT_BINARY_DIR}/plot_persistence_heat_map "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME plot_persistence_heat_map COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( compute_distance_of_persistence_heat_maps compute_distance_of_persistence_heat_maps.cpp ) target_link_libraries(compute_distance_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_distance_of_persistence_heat_maps ${CMAKE_CURRENT_BINARY_DIR}/compute_distance_of_persistence_heat_maps 1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME compute_distance_of_persistence_heat_maps COMMAND $ + "1" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( compute_scalar_product_of_persistence_heat_maps compute_scalar_product_of_persistence_heat_maps.cpp ) target_link_libraries(compute_scalar_product_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_scalar_product_of_persistence_heat_maps ${CMAKE_CURRENT_BINARY_DIR}/compute_scalar_product_of_persistence_heat_maps "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) +add_test(NAME compute_scalar_product_of_persistence_heat_maps COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") diff --git a/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt index b5c5928d..105b7efb 100644 --- a/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt +++ b/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt @@ -1,32 +1,46 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHI_STAT) +project(Persistence_representations_intervals_utilities) + +file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") -#persitence diagrams add_executable ( plot_persistence_intervals plot_persistence_intervals.cpp ) target_link_libraries( plot_persistence_intervals ${Boost_SYSTEM_LIBRARY}) -add_test ( plot_persistence_intervals ${CMAKE_CURRENT_BINARY_DIR}/plot_persistence_intervals "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME plot_persistence_intervals COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( compute_birth_death_range_in_persistence_diagram compute_birth_death_range_in_persistence_diagram.cpp ) target_link_libraries( compute_birth_death_range_in_persistence_diagram ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_birth_death_range_in_persistence_diagram ${CMAKE_CURRENT_BINARY_DIR}/compute_birth_death_range_in_persistence_diagram -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME compute_birth_death_range_in_persistence_diagram COMMAND $ + "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( compute_number_of_dominant_intervals compute_number_of_dominant_intervals.cpp ) target_link_libraries( compute_number_of_dominant_intervals ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_number_of_dominant_intervals ${CMAKE_CURRENT_BINARY_DIR}/compute_number_of_dominant_intervals "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" -1 2 ) + +add_test(NAME compute_number_of_dominant_intervals COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" "-1" "2") add_executable ( plot_histogram_of_intervals_lengths plot_histogram_of_intervals_lengths.cpp ) target_link_libraries( plot_histogram_of_intervals_lengths ${Boost_SYSTEM_LIBRARY}) -add_test ( plot_histogram_of_intervals_lengths ${CMAKE_CURRENT_BINARY_DIR}/plot_histogram_of_intervals_lengths "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" 2 ) + +add_test(NAME plot_histogram_of_intervals_lengths COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" "2") add_executable ( plot_persistence_Betti_numbers plot_persistence_Betti_numbers.cpp ) target_link_libraries( plot_persistence_Betti_numbers ${Boost_SYSTEM_LIBRARY}) -add_test ( plot_persistence_Betti_numbers ${CMAKE_CURRENT_BINARY_DIR}/plot_persistence_Betti_numbers "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +add_test(NAME plot_persistence_Betti_numbers COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) -add_executable ( compute_bottleneck_distance compute_bottleneck_distance.cpp ) -target_link_libraries( compute_bottleneck_distance ${Boost_SYSTEM_LIBRARY}) -if (TBB_FOUND) -target_link_libraries(compute_bottleneck_distance ${TBB_LIBRARIES}) -endif(TBB_FOUND) -add_test ( compute_bottleneck_distance ${CMAKE_CURRENT_BINARY_DIR}/compute_bottleneck_distance "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + add_executable ( compute_bottleneck_distance compute_bottleneck_distance.cpp ) + target_link_libraries( compute_bottleneck_distance ${Boost_SYSTEM_LIBRARY}) + if (TBB_FOUND) + target_link_libraries(compute_bottleneck_distance ${TBB_LIBRARIES}) + endif(TBB_FOUND) + + add_test(NAME compute_bottleneck_distance COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) diff --git a/src/Persistence_representations/utilities/persistence_landscapes/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_landscapes/CMakeLists.txt index 43533102..baf8de3c 100644 --- a/src/Persistence_representations/utilities/persistence_landscapes/CMakeLists.txt +++ b/src/Persistence_representations/utilities/persistence_landscapes/CMakeLists.txt @@ -1,26 +1,38 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHI_STAT) +project(Persistence_representations_lanscapes_utilities) +file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") - -#persitence landscapes add_executable ( create_landscapes create_landscapes.cpp ) target_link_libraries(create_landscapes ${Boost_SYSTEM_LIBRARY}) -add_test ( create_landscapes ${CMAKE_CURRENT_BINARY_DIR}/create_landscapes -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +# Will create simple_diagram.txt.land +add_test(NAME create_landscapes COMMAND $ + "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( average_landscapes average_landscapes.cpp ) target_link_libraries(average_landscapes ${Boost_SYSTEM_LIBRARY}) -add_test ( average_landscapes ${CMAKE_CURRENT_BINARY_DIR}/average_landscapes "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.land" ) + +add_test(NAME average_landscapes COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( plot_landscapes plot_landscapes.cpp ) target_link_libraries(plot_landscapes ${Boost_SYSTEM_LIBRARY}) -add_test ( plot_landscapes ${CMAKE_CURRENT_BINARY_DIR}/plot_landscapes "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.land" ) + +add_test(NAME plot_landscapes COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( compute_distance_of_landscapes compute_distance_of_landscapes.cpp ) target_link_libraries(compute_distance_of_landscapes ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_distance_of_landscapes ${CMAKE_CURRENT_BINARY_DIR}/compute_distance_of_landscapes 1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.land" ) + +add_test(NAME compute_distance_of_landscapes COMMAND $ + "1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.land" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.land") add_executable ( compute_scalar_product_of_landscapes compute_scalar_product_of_landscapes.cpp ) target_link_libraries(compute_scalar_product_of_landscapes ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_scalar_product_of_landscapes ${CMAKE_CURRENT_BINARY_DIR}/compute_scalar_product_of_landscapes "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.land" ) +add_test(NAME compute_scalar_product_of_landscapes COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.land" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.land") diff --git a/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt index f1ef144b..55a4fd50 100644 --- a/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt +++ b/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt @@ -1,27 +1,38 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHI_STAT) +project(Persistence_representations_lanscapes_on_grid_utilities) +file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") - - -#persitence landscapes on a grid add_executable ( create_landscapes_on_grid create_landscapes_on_grid.cpp ) target_link_libraries(create_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) -add_test ( create_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/create_landscapes_on_grid 100 -1 -1 -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +# Will create simple_diagram.txt.land +add_test(NAME create_landscapes_on_grid COMMAND $ + "100" "-1" "-1" "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( average_landscapes_on_grid average_landscapes_on_grid.cpp ) target_link_libraries(average_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) -add_test ( average_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/average_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" ) + +add_test(NAME average_landscapes_on_grid COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land") add_executable ( plot_landscapes_on_grid plot_landscapes_on_grid.cpp ) target_link_libraries(plot_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) -add_test ( plot_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/plot_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" ) + +add_test(NAME plot_landscapes_on_grid COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land") add_executable ( compute_distance_of_landscapes_on_grid compute_distance_of_landscapes_on_grid.cpp ) target_link_libraries(compute_distance_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_distance_of_landscapes_on_grids ${CMAKE_CURRENT_BINARY_DIR}/compute_distance_of_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" ) + +add_test(NAME compute_distance_of_landscapes_on_grid COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land") add_executable ( compute_scalar_product_of_landscapes_on_grid compute_scalar_product_of_landscapes_on_grid.cpp ) target_link_libraries(compute_scalar_product_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_scalar_product_of_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/compute_scalar_product_of_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" ) +add_test(NAME compute_scalar_product_of_landscapes_on_grid COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land") diff --git a/src/Persistence_representations/utilities/persistence_vectors/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_vectors/CMakeLists.txt index 8033e27a..e3d1013b 100644 --- a/src/Persistence_representations/utilities/persistence_vectors/CMakeLists.txt +++ b/src/Persistence_representations/utilities/persistence_vectors/CMakeLists.txt @@ -1,25 +1,38 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHI_STAT) +project(Persistence_vectors_utilities) + +file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") -#persitence vectors add_executable ( create_persistence_vectors create_persistence_vectors.cpp ) target_link_libraries(create_persistence_vectors ${Boost_SYSTEM_LIBRARY}) -add_test ( create_persistence_vectors ${CMAKE_CURRENT_BINARY_DIR}/create_persistence_vectors -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" ) + +# Will create simple_diagram.txt.vect +add_test(NAME create_persistence_vectors COMMAND $ + "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt") add_executable ( average_persistence_vectors average_persistence_vectors.cpp ) target_link_libraries(average_persistence_vectors ${Boost_SYSTEM_LIBRARY}) -add_test ( average_persistence_vectors ${CMAKE_CURRENT_BINARY_DIR}/average_persistence_vectors "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.vect" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.vect" ) + +add_test(NAME average_persistence_vectors COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.vect" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.vect") add_executable ( compute_distance_of_persistence_vectors compute_distance_of_persistence_vectors.cpp ) target_link_libraries(compute_distance_of_persistence_vectors ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_distance_of_persistence_vectors ${CMAKE_CURRENT_BINARY_DIR}/compute_distance_of_persistence_vectors -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.vect" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.vect" ) + +add_test(NAME compute_distance_of_persistence_vectors COMMAND $ + "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.vect" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.vect") add_executable ( compute_scalar_product_of_persistence_vectors compute_scalar_product_of_persistence_vectors.cpp ) target_link_libraries(compute_scalar_product_of_persistence_vectors ${Boost_SYSTEM_LIBRARY}) -add_test ( compute_scalar_product_of_persistence_vectors ${CMAKE_CURRENT_BINARY_DIR}/compute_scalar_product_of_persistence_vectors "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.vect" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.vect" ) + +add_test(NAME compute_scalar_product_of_persistence_vectors COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.vect" + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.vect") add_executable ( plot_persistence_vectors plot_persistence_vectors.cpp ) target_link_libraries(plot_persistence_vectors ${Boost_SYSTEM_LIBRARY}) -add_test ( plot_persistence_vectors ${CMAKE_CURRENT_BINARY_DIR}/plot_persistence_vectors "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.vect" ) - +add_test(NAME plot_persistence_vectors COMMAND $ + "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.vect") -- cgit v1.2.3