Add cmake improvement for Persistence representation module.

Was bad tested and too hard to maintain


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representation_integration_cmake_improvement@3071 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: fa4684701edbe6d172e75f119afa912eb3b5dad7

1 files changed, 15 insertions, 23 deletions

diff --git a/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt
index 2ba6efe5..897e12a3 100644
--- a/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt
+++ b/src/Persistence_representations/utilities/persistence_intervals/CMakeLists.txt
@@ -1,40 +1,32 @@
 cmake_minimum_required(VERSION 2.6)
 project(Persistence_representations_intervals_utilities)
 
-file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-add_executable ( plot_persistence_intervals plot_persistence_intervals.cpp )
-
-add_test(NAME plot_persistence_intervals COMMAND $<TARGET_FILE:plot_persistence_intervals>
-    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt")
-
-add_executable ( compute_birth_death_range_in_persistence_diagram compute_birth_death_range_in_persistence_diagram.cpp )
-
-add_test(NAME compute_birth_death_range_in_persistence_diagram COMMAND $<TARGET_FILE:compute_birth_death_range_in_persistence_diagram>
-    "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt")
+add_executable ( plot_histogram_of_intervals_lengths plot_histogram_of_intervals_lengths.cpp )
 
-add_executable ( compute_number_of_dominant_intervals compute_number_of_dominant_intervals.cpp )
+add_test(NAME plot_histogram_of_intervals_lengths COMMAND $<TARGET_FILE:plot_histogram_of_intervals_lengths>
+    "${CMAKE_CURRENT_BINARY_DIR}/../first.pers" "-1")
 
-add_test(NAME compute_number_of_dominant_intervals COMMAND $<TARGET_FILE:compute_number_of_dominant_intervals>
-    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" "-1" "2")
+add_persistence_representation_plot_utility(plot_persistence_intervals "")
+add_persistence_representation_plot_utility(plot_persistence_Betti_numbers "")
 
-add_executable ( plot_histogram_of_intervals_lengths plot_histogram_of_intervals_lengths.cpp )
+add_persistence_representation_creation_utility(compute_birth_death_range_in_persistence_diagram "-1")
 
-add_test(NAME plot_histogram_of_intervals_lengths COMMAND $<TARGET_FILE:plot_histogram_of_intervals_lengths>
-    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt" "2")
 
-add_executable ( plot_persistence_Betti_numbers plot_persistence_Betti_numbers.cpp )
+add_executable ( compute_number_of_dominant_intervals compute_number_of_dominant_intervals.cpp )
+add_test(NAME Persistence_representation_utilities_compute_number_of_dominant_intervals
+    COMMAND $<TARGET_FILE:compute_number_of_dominant_intervals>
+    "${CMAKE_CURRENT_BINARY_DIR}/../first.pers" "-1" "2")
 
-add_test(NAME plot_persistence_Betti_numbers COMMAND $<TARGET_FILE:plot_persistence_Betti_numbers>
-    "${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 )
   if (TBB_FOUND)
   target_link_libraries(compute_bottleneck_distance ${TBB_LIBRARIES})
   endif(TBB_FOUND)
-
-  add_test(NAME compute_bottleneck_distance COMMAND $<TARGET_FILE:compute_bottleneck_distance>
-      "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt"
-      "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt")
+  add_test(NAME Persistence_representation_utilities_compute_bottleneck_distance
+      COMMAND $<TARGET_FILE:compute_bottleneck_distance>
+      "-1"
+      "${CMAKE_CURRENT_BINARY_DIR}/../first.pers"
+      "${CMAKE_CURRENT_BINARY_DIR}/../second.pers")
 endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)