summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Gudhi_stat/example/CMakeLists.txt116
-rwxr-xr-xsrc/Gudhi_stat/example/persistence_landscape_on_gridbin76816 -> 0 bytes
-rwxr-xr-xsrc/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistencebin80766 -> 0 bytes
-rwxr-xr-xsrc/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagrambin61596 -> 0 bytes
-rwxr-xr-xsrc/Gudhi_stat/example/utilities/persistence_intervals/compute_number_of_dominant_intervalsbin57320 -> 0 bytes
-rwxr-xr-xsrc/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengthsbin61940 -> 0 bytes
-rwxr-xr-xsrc/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrsbin62043 -> 0 bytes
-rwxr-xr-xsrc/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_intervalsbin66379 -> 0 bytes
-rw-r--r--src/Gudhi_stat/test/CMakeLists.txt49
-rw-r--r--src/Persistent_cohomology/example/CMakeLists.txt4
10 files changed, 72 insertions, 97 deletions
diff --git a/src/Gudhi_stat/example/CMakeLists.txt b/src/Gudhi_stat/example/CMakeLists.txt
index 5716ff31..613e4d26 100644
--- a/src/Gudhi_stat/example/CMakeLists.txt
+++ b/src/Gudhi_stat/example/CMakeLists.txt
@@ -20,100 +20,100 @@ target_link_libraries(persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
##UTILITIES:
#persitence diagrams
-add_executable ( utilities/persistence_intervals/plot_persistence_intervals utilities/persistence_intervals/plot_persistence_intervals.cpp )
-target_link_libraries( utilities/persistence_intervals/plot_persistence_intervals ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_persistence_intervals utilities/persistence_intervals/plot_persistence_intervals.cpp )
+target_link_libraries( plot_persistence_intervals ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp )
-target_link_libraries( utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_birth_death_range_in_persistence_diagram utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp )
+target_link_libraries( compute_birth_death_range_in_persistence_diagram ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_intervals/compute_number_of_dominant_intervals utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp )
-target_link_libraries( utilities/persistence_intervals/compute_number_of_dominant_intervals ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_number_of_dominant_intervals utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp )
+target_link_libraries( compute_number_of_dominant_intervals ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_intervals/plot_histogram_of_intervals_lengths utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp )
-target_link_libraries( utilities/persistence_intervals/plot_histogram_of_intervals_lengths ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_histogram_of_intervals_lengths utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp )
+target_link_libraries( plot_histogram_of_intervals_lengths ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_intervals/plot_persistence_Betti_numebrs utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp )
-target_link_libraries( utilities/persistence_intervals/plot_persistence_Betti_numebrs ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_persistence_Betti_numebrs utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp )
+target_link_libraries( plot_persistence_Betti_numebrs ${Boost_SYSTEM_LIBRARY})
#when we have bottleneck and wasserstein distance computations, add suitable programs here.
#persitence landscapes
-add_executable ( utilities/persistence_landscapes/average_landscapes utilities/persistence_landscapes/average_landscapes.cpp )
-target_link_libraries(utilities/persistence_landscapes/average_landscapes ${Boost_SYSTEM_LIBRARY})
+add_executable ( average_landscapes utilities/persistence_landscapes/average_landscapes.cpp )
+target_link_libraries(average_landscapes ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes/create_landscapes utilities/persistence_landscapes/create_landscapes.cpp )
-target_link_libraries(utilities/persistence_landscapes/create_landscapes ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_landscapes utilities/persistence_landscapes/create_landscapes.cpp )
+target_link_libraries(create_landscapes ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes/plot_landscapes utilities/persistence_landscapes/plot_landscapes.cpp )
-target_link_libraries(utilities/persistence_landscapes/plot_landscapes ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_landscapes utilities/persistence_landscapes/plot_landscapes.cpp )
+target_link_libraries(plot_landscapes ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes/compute_distance_of_landscapes utilities/persistence_landscapes/compute_distance_of_landscapes.cpp )
-target_link_libraries(utilities/persistence_landscapes/compute_distance_of_landscapes ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_distance_of_landscapes utilities/persistence_landscapes/compute_distance_of_landscapes.cpp )
+target_link_libraries(compute_distance_of_landscapes ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes/compute_scalar_product_of_landscapes utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp )
-target_link_libraries(utilities/persistence_landscapes/compute_scalar_product_of_landscapes ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_scalar_product_of_landscapes utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp )
+target_link_libraries(compute_scalar_product_of_landscapes ${Boost_SYSTEM_LIBRARY})
#persitence landscapes on a grid
-add_executable ( utilities/persistence_landscapes_on_grid/average_landscapes_on_grid utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp )
-target_link_libraries(utilities/persistence_landscapes_on_grid/average_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
+add_executable ( average_landscapes_on_grid utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp )
+target_link_libraries(average_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes_on_grid/create_landscapes_on_grid utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp )
-target_link_libraries(utilities/persistence_landscapes_on_grid/create_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_landscapes_on_grid utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp )
+target_link_libraries(create_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp )
-target_link_libraries(utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_landscapes_on_grid utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp )
+target_link_libraries(plot_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp )
-target_link_libraries(utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_distance_of_landscapes_on_grid utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp )
+target_link_libraries(compute_distance_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp )
-target_link_libraries(utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_scalar_product_of_landscapes_on_grid utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp )
+target_link_libraries(compute_scalar_product_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
#persitence heat maps
-add_executable ( utilities/persistence_heat_maps/average_persistence_heat_maps utilities/persistence_heat_maps/average_persistence_heat_maps.cpp )
-target_link_libraries(utilities/persistence_heat_maps/average_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
+add_executable ( average_persistence_heat_maps utilities/persistence_heat_maps/average_persistence_heat_maps.cpp )
+target_link_libraries(average_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_heat_maps/create_persistence_heat_maps utilities/persistence_heat_maps/create_persistence_heat_maps.cpp )
-target_link_libraries(utilities/persistence_heat_maps/create_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_persistence_heat_maps utilities/persistence_heat_maps/create_persistence_heat_maps.cpp )
+target_link_libraries(create_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_heat_maps/plot_persistence_heat_map utilities/persistence_heat_maps/plot_persistence_heat_map.cpp )
-target_link_libraries(utilities/persistence_heat_maps/plot_persistence_heat_map ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_persistence_heat_map utilities/persistence_heat_maps/plot_persistence_heat_map.cpp )
+target_link_libraries(plot_persistence_heat_map ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp )
-target_link_libraries(utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_distance_of_persistence_heat_maps utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp )
+target_link_libraries(compute_distance_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp )
-target_link_libraries(utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_scalar_product_of_persistence_heat_maps utilities/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_executable ( utilities/persistence_heat_maps/create_pssk utilities/persistence_heat_maps/create_pssk.cpp )
-target_link_libraries(utilities/persistence_heat_maps/create_pssk ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_pssk utilities/persistence_heat_maps/create_pssk.cpp )
+target_link_libraries(create_pssk ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp )
-target_link_libraries(utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_persistence_heat_maps_weighted_by_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp )
+target_link_libraries(create_persistence_heat_maps_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp )
-target_link_libraries(utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp )
+target_link_libraries(create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp )
-target_link_libraries(utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_persistence_heat_maps_weighted_by_arctan_of_their_persistence utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp )
+target_link_libraries(create_persistence_heat_maps_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY})
#persitence vectors
-add_executable ( utilities/persistence_vectors/average_persistence_vectors utilities/persistence_vectors/average_persistence_vectors.cpp )
-target_link_libraries(utilities/persistence_vectors/average_persistence_vectors ${Boost_SYSTEM_LIBRARY})
+add_executable ( average_persistence_vectors utilities/persistence_vectors/average_persistence_vectors.cpp )
+target_link_libraries(average_persistence_vectors ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_vectors/create_persistence_vectors utilities/persistence_vectors/create_persistence_vectors.cpp )
-target_link_libraries(utilities/persistence_vectors/create_persistence_vectors ${Boost_SYSTEM_LIBRARY})
+add_executable ( create_persistence_vectors utilities/persistence_vectors/create_persistence_vectors.cpp )
+target_link_libraries(create_persistence_vectors ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_vectors/compute_distance_of_persistence_vectors utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp )
-target_link_libraries(utilities/persistence_vectors/compute_distance_of_persistence_vectors ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_distance_of_persistence_vectors utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp )
+target_link_libraries(compute_distance_of_persistence_vectors ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp )
-target_link_libraries(utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors ${Boost_SYSTEM_LIBRARY})
+add_executable ( compute_scalar_product_of_persistence_vectors utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp )
+target_link_libraries(compute_scalar_product_of_persistence_vectors ${Boost_SYSTEM_LIBRARY})
-add_executable ( utilities/persistence_vectors/plot_persistence_vectors utilities/persistence_vectors/plot_persistence_vectors.cpp )
-target_link_libraries(utilities/persistence_vectors/plot_persistence_vectors ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_persistence_vectors utilities/persistence_vectors/plot_persistence_vectors.cpp )
+target_link_libraries(plot_persistence_vectors ${Boost_SYSTEM_LIBRARY})
diff --git a/src/Gudhi_stat/example/persistence_landscape_on_grid b/src/Gudhi_stat/example/persistence_landscape_on_grid
deleted file mode 100755
index 0a0603da..00000000
--- a/src/Gudhi_stat/example/persistence_landscape_on_grid
+++ /dev/null
Binary files differ
diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence b/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence
deleted file mode 100755
index 08e53590..00000000
--- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence
+++ /dev/null
Binary files differ
diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram b/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram
deleted file mode 100755
index c4955d0e..00000000
--- a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram
+++ /dev/null
Binary files differ
diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_number_of_dominant_intervals b/src/Gudhi_stat/example/utilities/persistence_intervals/compute_number_of_dominant_intervals
deleted file mode 100755
index 9be7cfad..00000000
--- a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_number_of_dominant_intervals
+++ /dev/null
Binary files differ
diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths
deleted file mode 100755
index 5d063bc1..00000000
--- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths
+++ /dev/null
Binary files differ
diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs
deleted file mode 100755
index 664ac49f..00000000
--- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs
+++ /dev/null
Binary files differ
diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_intervals b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_intervals
deleted file mode 100755
index 95e85258..00000000
--- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_intervals
+++ /dev/null
Binary files differ
diff --git a/src/Gudhi_stat/test/CMakeLists.txt b/src/Gudhi_stat/test/CMakeLists.txt
index 6fb4310f..292549f8 100644
--- a/src/Gudhi_stat/test/CMakeLists.txt
+++ b/src/Gudhi_stat/test/CMakeLists.txt
@@ -14,11 +14,8 @@ if (GPROF_PATH)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pg")
endif()
-
-
-
-
-
+# copy data directory for tests purpose
+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})
@@ -26,16 +23,8 @@ target_link_libraries(persistence_intervals_test ${Boost_SYSTEM_LIBRARY} ${Boost
# 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_test.xml --log_level=test_suite --report_level=no)
-
-
-
-
-
-
-
-
+ # 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)
add_executable ( vector_representation_test vector_representation_test.cpp )
@@ -44,10 +33,8 @@ target_link_libraries(vector_representation_test ${Boost_SYSTEM_LIBRARY} ${Boost
# 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_test.xml --log_level=test_suite --report_level=no)
-
-
+ # 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)
add_executable ( persistence_lanscapes_test persistence_lanscapes_test.cpp )
@@ -56,10 +43,8 @@ target_link_libraries(persistence_lanscapes_test ${Boost_SYSTEM_LIBRARY} ${Boost
# 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_test.xml --log_level=test_suite --report_level=no)
-
-
+ # 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)
add_executable ( persistence_lanscapes_on_grid_test persistence_lanscapes_on_grid_test.cpp )
@@ -68,18 +53,8 @@ target_link_libraries(persistence_lanscapes_on_grid_test ${Boost_SYSTEM_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_test.xml --log_level=test_suite --report_level=no)
-
-
-
-
-
-
-
-
-
-
+ # 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)
add_executable ( persistence_heat_maps_test persistence_heat_maps_test.cpp )
@@ -88,5 +63,5 @@ target_link_libraries(persistence_heat_maps_test ${Boost_SYSTEM_LIBRARY} ${Boost
# 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_test.xml --log_level=test_suite --report_level=no) \ No newline at end of file
+ # 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)
diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index 222606d6..b823d658 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -74,8 +74,8 @@ endif(GMP_FOUND)
message(STATUS "Eigen3 version: ${EIGEN3_VERSION}.")
include( ${EIGEN3_USE_FILE} )
- #add_executable (alpha_complex_persistence alpha_complex_persistence.cpp)
- #target_link_libraries(alpha_complex_persistence ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
+ add_executable (alpha_complex_persistence alpha_complex_persistence.cpp)
+ target_link_libraries(alpha_complex_persistence ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
add_executable(periodic_alpha_complex_3d_persistence periodic_alpha_complex_3d_persistence.cpp)
target_link_libraries(periodic_alpha_complex_3d_persistence ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})