diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-01-25 14:06:24 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-01-25 14:06:24 +0000 |
commit | cafbe7d63d0e16e27721864a1ffa1a67d8f0374f (patch) | |
tree | d082d4c483e23e0388878b8726b690dfd50a2018 /src/Nerve_GIC/test | |
parent | d8f04fab98dcb46ba7b300048311bf9e8b0ab3d2 (diff) |
Code review : fix camel case for types and use of std::log instead of log
Add CGAL dependency for Nerve_GIC (link to bottleneck)
Add persistence representation in bibtex
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3155 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 8a45497b3d1f34a5c4a1c7856113c6b7680a12a2
Diffstat (limited to 'src/Nerve_GIC/test')
-rw-r--r-- | src/Nerve_GIC/test/CMakeLists.txt | 19 | ||||
-rw-r--r-- | src/Nerve_GIC/test/test_GIC.cpp | 4 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/Nerve_GIC/test/CMakeLists.txt b/src/Nerve_GIC/test/CMakeLists.txt index 03fe47ca..c35cdff7 100644 --- a/src/Nerve_GIC/test/CMakeLists.txt +++ b/src/Nerve_GIC/test/CMakeLists.txt @@ -1,14 +1,17 @@ cmake_minimum_required(VERSION 2.6) project(Graph_induced_complex_tests) -include(GUDHI_test_coverage) +if (NOT CGAL_VERSION VERSION_LESS 4.8.1) + include(GUDHI_test_coverage) -add_executable ( Nerve_GIC_test_unit test_GIC.cpp ) -target_link_libraries(Nerve_GIC_test_unit ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) -if (TBB_FOUND) - target_link_libraries(Nerve_GIC_test_unit ${TBB_LIBRARIES}) -endif() + add_executable ( Nerve_GIC_test_unit test_GIC.cpp ) + target_link_libraries(Nerve_GIC_test_unit ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) + if (TBB_FOUND) + target_link_libraries(Nerve_GIC_test_unit ${TBB_LIBRARIES}) + endif() -file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) + file(COPY data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) -gudhi_add_coverage_test(Nerve_GIC_test_unit) + gudhi_add_coverage_test(Nerve_GIC_test_unit) + +endif (NOT CGAL_VERSION VERSION_LESS 4.8.1) diff --git a/src/Nerve_GIC/test/test_GIC.cpp b/src/Nerve_GIC/test/test_GIC.cpp index a8b1e7f7..d633753c 100644 --- a/src/Nerve_GIC/test/test_GIC.cpp +++ b/src/Nerve_GIC/test/test_GIC.cpp @@ -24,11 +24,11 @@ #define BOOST_TEST_MODULE "graph_induced_complex" #include <boost/test/unit_test.hpp> -#include <cmath> // float comparison + #include <limits> #include <string> #include <vector> -#include <algorithm> // std::max + #include <gudhi/GIC.h> #include <gudhi/distance_functions.h> #include <gudhi/reader_utils.h> |