From 3bb99253e96d186bdfb3c42ef112086dcf3157c5 Mon Sep 17 00:00:00 2001 From: mcarrier Date: Tue, 24 Jan 2017 16:22:09 +0000 Subject: Edit CMake and Doxy files git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2001 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: cea2ab8fcf5f06109432c74f3433fdbc0f90c5a9 --- CMakeLists.txt | 3 +++ biblio/how_to_cite_gudhi.bib | 9 +++++++++ src/CMakeLists.txt | 1 + src/Doxyfile | 3 ++- src/cmake/modules/GUDHI_user_version_target.txt | 2 +- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1346f5d9..2d27bf8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,6 +126,7 @@ else() include_directories(src/Bottleneck_distance/include/) include_directories(src/Contraction/include/) include_directories(src/Hasse_complex/include/) + include_directories(src/Nerve_GIC/include/) include_directories(src/Persistent_cohomology/include/) include_directories(src/Rips_complex/include/) include_directories(src/Simplex_tree/include/) @@ -149,6 +150,8 @@ else() add_subdirectory(src/Witness_complex/example) add_subdirectory(src/Bitmap_cubical_complex/test) add_subdirectory(src/Bitmap_cubical_complex/example) + add_subdirectory(src/Nerve_GIC/example) + add_subdirectory(src/Nerve_GIC/test) add_subdirectory(src/Alpha_complex/example) add_subdirectory(src/Alpha_complex/test) add_subdirectory(src/Spatial_searching/example) diff --git a/biblio/how_to_cite_gudhi.bib b/biblio/how_to_cite_gudhi.bib index fde1d9b1..f87b53c4 100644 --- a/biblio/how_to_cite_gudhi.bib +++ b/biblio/how_to_cite_gudhi.bib @@ -112,4 +112,13 @@ , booktitle = "{GUDHI} User and Reference Manual" , url = "http://gudhi.gforge.inria.fr/doc/latest/group__bottleneck__distance.html" , year = 2016 +} + +@incollection{gudhi:NerveGIC +, author = "Mathieu Carri\`ere" +, title = "Nerve and GIC" +, publisher = "{GUDHI Editorial Board}" +, booktitle = "{GUDHI} User and Reference Manual" +, url = "http://gudhi.gforge.inria.fr/doc/latest/group__Nerve__GIC.html" +, year = 2017 } \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb349052..ebdcdcea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -117,6 +117,7 @@ else() add_subdirectory(example/Subsampling) add_subdirectory(example/Tangential_complex) add_subdirectory(example/Bottleneck_distance) + add_subdirectory(example/Nerve_GIC) # data points generator add_subdirectory(data/points/generator) diff --git a/src/Doxyfile b/src/Doxyfile index a41c6d6f..f06fbd23 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -851,7 +851,8 @@ IMAGE_PATH = doc/Skeleton_blocker/ \ doc/Subsampling/ \ doc/Spatial_searching/ \ doc/Tangential_complex/ \ - doc/Bottleneck_distance/ + doc/Bottleneck_distance/ \ + doc/Nerve_GIC/ # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program diff --git a/src/cmake/modules/GUDHI_user_version_target.txt b/src/cmake/modules/GUDHI_user_version_target.txt index 6332b065..71e35353 100644 --- a/src/cmake/modules/GUDHI_user_version_target.txt +++ b/src/cmake/modules/GUDHI_user_version_target.txt @@ -48,7 +48,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI) - set(GUDHI_MODULES "common;Alpha_complex;Bitmap_cubical_complex;Bottleneck_distance;Contraction;Hasse_complex;Persistent_cohomology;Rips_complex;Simplex_tree;Skeleton_blocker;Spatial_searching;Subsampling;Tangential_complex;Witness_complex") + set(GUDHI_MODULES "common;Alpha_complex;Bitmap_cubical_complex;Bottleneck_distance;Contraction;Hasse_complex;Nerve_GIC;Persistent_cohomology;Rips_complex;Simplex_tree;Skeleton_blocker;Spatial_searching;Subsampling;Tangential_complex;Witness_complex") foreach(GUDHI_MODULE ${GUDHI_MODULES}) # doc files -- cgit v1.2.3