diff options
| author | Siargey Kachanovich <siargey.kachanovich@inria.fr> | 2019-10-17 21:44:46 +0200 |
|---|---|---|
| committer | Siargey Kachanovich <siargey.kachanovich@inria.fr> | 2019-10-17 21:44:46 +0200 |
| commit | a24dc1591749a849ed5c356d4fafef1eb87727ae (patch) | |
| tree | 4fa59c52609a4e218e2125bfb49597a30b5f238c /src/Contraction/include/gudhi/Skeleton_blocker_contractor.h | |
| parent | ec9953f0dbe0f69074f25cc95442ea0012db7d98 (diff) | |
| parent | a6c844172072f1798bbbe6d5c9b4f3a548cb4c50 (diff) | |
Merge remote-tracking branch 'upstream/patch-1' into coxeter-integration
Diffstat (limited to 'src/Contraction/include/gudhi/Skeleton_blocker_contractor.h')
| -rw-r--r-- | src/Contraction/include/gudhi/Skeleton_blocker_contractor.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h index 13086161..c2b3157c 100644 --- a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h +++ b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h @@ -1,31 +1,17 @@ -/* This file is part of the Gudhi Library. The Gudhi library - * (Geometric Understanding in Higher Dimensions) is a generic C++ - * library for computational topology. - * +/* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT. + * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details. * Author(s): David Salinas * * Copyright (C) 2014 Inria * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * Modification(s): + * - 2019/08 Vincent Rouvreau: Fix issue #10 for CGAL + * - YYYY/MM Author: Description of the modification */ #ifndef SKELETON_BLOCKER_CONTRACTOR_H_ #define SKELETON_BLOCKER_CONTRACTOR_H_ -// todo remove the queue to be independent from cgald -#include <gudhi/Contraction/CGAL_queue/Modifiable_priority_queue.h> - #include <gudhi/Contraction/Edge_profile.h> #include <gudhi/Contraction/policies/Cost_policy.h> #include <gudhi/Contraction/policies/Edge_length_cost.h> @@ -39,6 +25,9 @@ #include <gudhi/Skeleton_blocker/Skeleton_blocker_complex_visitor.h> #include <gudhi/Debug_utils.h> +// todo remove the queue to be independent from cgal +#include <CGAL/Modifiable_priority_queue.h> +#include <CGAL/version.h> // for CGAL_VERSION_NR #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> @@ -49,6 +38,11 @@ #include <utility> // for pair #include <vector> +// Make compilation fail - required for external projects - https://github.com/GUDHI/gudhi-devel/issues/10 +#if CGAL_VERSION_NR < 1041101000 +# error Alpha_complex_3d is only available for CGAL >= 4.11 +#endif + namespace Gudhi { namespace contraction { |