From c97ef32a8f8959c3ad67543a5e22fb6e1a82cda5 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 10 Dec 2014 16:09:31 +0000
Subject: Add examples in tests

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

Former-commit-id: a53767f02ba413531d397ebf720d87ed9d832a79
---
 src/Persistent_cohomology/example/CMakeLists.txt | 13 ++++++++++---
 src/Persistent_cohomology/test/CMakeLists.txt    |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/Persistent_cohomology')

diff --git a/src/Persistent_cohomology/example/CMakeLists.txt b/src/Persistent_cohomology/example/CMakeLists.txt
index dca4a04d..98213545 100644
--- a/src/Persistent_cohomology/example/CMakeLists.txt
+++ b/src/Persistent_cohomology/example/CMakeLists.txt
@@ -5,18 +5,25 @@ project(GUDHIExPersCohom)
 find_package(Boost 1.45.0 COMPONENTS system program_options)
 message("Boost_lib = ${Boost_LIBRARIES}")
 
-add_executable ( rips_persistence rips_persistence.cpp )
+add_executable(rips_persistence rips_persistence.cpp)
 target_link_libraries(rips_persistence ${Boost_LIBRARIES})
-add_executable ( rips_persistence_from_alpha_shape_3 rips_persistence_from_alpha_shape_3.cpp )
+add_test(rips_persistence_2 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -m 100)
+add_test(rips_persistence_3 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 3 -m 100)
+
+add_executable(rips_persistence_from_alpha_shape_3 rips_persistence_from_alpha_shape_3.cpp )
 target_link_libraries(rips_persistence_from_alpha_shape_3 ${Boost_LIBRARIES})
 
 if(GMPXX_FOUND AND GMP_FOUND)
    message("GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}")
    message("GMP_LIBRARIES = ${GMP_LIBRARIES}")
 
-   add_executable ( rips_multifield_persistence rips_multifield_persistence.cpp )
+   add_executable(rips_multifield_persistence rips_multifield_persistence.cpp )
    target_link_libraries(rips_multifield_persistence  ${Boost_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
+   add_test(rips_multifield_persistence_2_3 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -q 3 -m 100)
+   add_test(rips_multifield_persistence_2_71 ${CMAKE_CURRENT_BINARY_DIR}/rips_multifield_persistence ${CMAKE_SOURCE_DIR}/data/points/Kl.txt -r 0.25 -d 3 -p 2 -q 71 -m 100)
 
    add_executable ( performance_rips_persistence performance_rips_persistence.cpp )
    target_link_libraries(performance_rips_persistence  ${Boost_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
+   add_test(rips_persistence_from_alpha_shape_3_2_0 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence_from_alpha_shape_3 ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 2 -m 0)
+   add_test(rips_persistence_from_alpha_shape_3_3_100 ${CMAKE_CURRENT_BINARY_DIR}/rips_persistence_from_alpha_shape_3 ${CMAKE_SOURCE_DIR}/data/points/bunny_5000.st -p 3 -m 100)
 endif()
diff --git a/src/Persistent_cohomology/test/CMakeLists.txt b/src/Persistent_cohomology/test/CMakeLists.txt
index 0e5bab1b..c1cbc572 100644
--- a/src/Persistent_cohomology/test/CMakeLists.txt
+++ b/src/Persistent_cohomology/test/CMakeLists.txt
@@ -23,12 +23,12 @@ if(GMPXX_FOUND AND GMP_FOUND)
    target_link_libraries(persistent_cohomology_unit_test_multi_field  ${Boost_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
 
    # Unitary tests
-   add_test(persistent_cohomology_unit_test_multi_field ${CMAKE_CURRENT_BINARY_DIR}/persistent_cohomology_unit_test_multi_field)
+   #add_test(persistent_cohomology_unit_test_multi_field ${CMAKE_CURRENT_BINARY_DIR}/persistent_cohomology_unit_test_multi_field)
 endif()
 
 if (LCOV_PATH)
   # Lcov code coverage of unitary test
-  add_test(persistent_cohomology_unit_test_coverage.info ${CMAKE_SOURCE_DIR}/scripts/check_code_coverage.sh ${CMAKE_SOURCE_DIR}/src/Persistent_cohomology)
+  add_test(src/Persistent_cohomology/lcov/coverage.log ${CMAKE_SOURCE_DIR}/scripts/check_code_coverage.sh ${CMAKE_SOURCE_DIR}/src/Persistent_cohomology)
 endif()
 
 if (PYTHON_PATH)
-- 
cgit v1.2.3