diff options
| author | Marc Glisse <marc.glisse@inria.fr> | 2022-11-15 15:50:18 +0100 |
|---|---|---|
| committer | Marc Glisse <marc.glisse@inria.fr> | 2022-11-21 22:50:23 +0100 |
| commit | 9920ebf573304c19dd18389ddcff3e677a8bc92a (patch) | |
| tree | 1d90ac96cdd96e4268b39b7ad60563ad593d18cc /src/Nerve_GIC/include/gudhi/GIC.h | |
| parent | 2752ead7b1db5895064f9bb72f81e6e928fcaf7c (diff) | |
Fall back to Hera's bottleneck without CGAL
Once we move to Hera 2, we could just add it to include_directories and
not bother adding it specifically for 3 python files + some tests and
examples.
[skip ci]
Diffstat (limited to 'src/Nerve_GIC/include/gudhi/GIC.h')
| -rw-r--r-- | src/Nerve_GIC/include/gudhi/GIC.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h index 1b1f9323..3f9f0dc5 100644 --- a/src/Nerve_GIC/include/gudhi/GIC.h +++ b/src/Nerve_GIC/include/gudhi/GIC.h @@ -17,6 +17,14 @@ #include <mutex> #endif +#if __has_include(<CGAL/version.h>) +# define GUDHI_GIC_USE_CGAL 1 +# include <gudhi/Bottleneck.h> +#elif __has_include(<bottleneck.h>) +# define GUDHI_GIC_USE_HERA 1 +# include <bottleneck.h> +#endif + #include <gudhi/Debug_utils.h> #include <gudhi/graph_simplicial_complex.h> #include <gudhi/reader_utils.h> @@ -25,7 +33,6 @@ #include <gudhi/Points_off_io.h> #include <gudhi/distance_functions.h> #include <gudhi/Persistent_cohomology.h> -#include <gudhi/Bottleneck.h> #include <boost/config.hpp> #include <boost/graph/graph_traits.hpp> @@ -35,8 +42,6 @@ #include <boost/graph/subgraph.hpp> #include <boost/graph/graph_utility.hpp> -#include <CGAL/version.h> // for CGAL_VERSION_NR - #include <iostream> #include <vector> #include <map> @@ -1228,7 +1233,13 @@ class Cover_complex { Cboot.set_cover_from_function(); Cboot.find_simplices(); Cboot.compute_PD(); +#ifdef GUDHI_GIC_USE_CGAL double db = Gudhi::persistence_diagram::bottleneck_distance(this->PD, Cboot.PD); +#elif defined GUDHI_GIC_USE_HERA + double db = hera::bottleneckDistExact(this->PD, Cboot.PD); +#else + throw std::logic_error("This function requires CGAL or Hera for the bottleneck distance."); +#endif if (verbose) std::clog << db << std::endl; distribution.push_back(db); } |