From 64e6c96afa4d1a95b8d6ee74ea910c1cb80ebbd9 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 14 Jun 2019 14:45:22 +0200 Subject: Remove gudhi_patches for CGAL and CGAL 4.11.0 is now the minimal CGAL version required. Modification of documentation accordingly --- .../CGAL/NewKernel_d/Kernel_d_interface.h | 298 --------------------- 1 file changed, 298 deletions(-) delete mode 100644 src/common/include/gudhi_patches/CGAL/NewKernel_d/Kernel_d_interface.h (limited to 'src/common/include/gudhi_patches/CGAL/NewKernel_d/Kernel_d_interface.h') diff --git a/src/common/include/gudhi_patches/CGAL/NewKernel_d/Kernel_d_interface.h b/src/common/include/gudhi_patches/CGAL/NewKernel_d/Kernel_d_interface.h deleted file mode 100644 index dd888005..00000000 --- a/src/common/include/gudhi_patches/CGAL/NewKernel_d/Kernel_d_interface.h +++ /dev/null @@ -1,298 +0,0 @@ -// Copyright (c) 2014 -// INRIA Saclay-Ile de France (France) -// -// This file is part of CGAL (www.cgal.org); you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 3 of the License, -// or (at your option) any later version. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// Author(s) : Marc Glisse - -#ifndef CGAL_KD_KERNEL_D_INTERFACE_H -#define CGAL_KD_KERNEL_D_INTERFACE_H - -#include -#include -#include -#include - - -namespace CGAL { -template struct Kernel_d_interface : public Base_ { - CGAL_CONSTEXPR Kernel_d_interface(){} - CGAL_CONSTEXPR Kernel_d_interface(int d):Base_(d){} - - typedef Base_ Base; - typedef Kernel_d_interface Kernel; - typedef Base_ R_; // for the macros - typedef typename Get_type::type RT; - typedef typename Get_type::type FT; - typedef typename Get_type::type Boolean; - typedef typename Get_type::type Sign; - typedef typename Get_type::type Comparison_result; - typedef typename Get_type::type Orientation; - typedef typename Get_type::type Oriented_side; - typedef typename Get_type::type Bounded_side; - typedef typename Get_type::type Angle; - typedef typename Get_type::type Flat_orientation_d; - typedef typename Get_type::type Point_d; - typedef typename Get_type::type Vector_d; - typedef typename Get_type::type Segment_d; - typedef typename Get_type::type Sphere_d; - typedef typename Get_type::type Hyperplane_d; - typedef Vector_d Direction_d; - typedef typename Get_type::type Line_d; - typedef typename Get_type::type Ray_d; - typedef typename Get_type::type Iso_box_d; - typedef typename Get_type::type Aff_transformation_d; - typedef typename Get_type::type Weighted_point_d; - typedef typename Get_functor::type Compute_coordinate_d; - typedef typename Get_functor::type Compare_lexicographically_d; - typedef typename Get_functor::type Equal_d; - typedef typename Get_functor::type Less_lexicographically_d; - typedef typename Get_functor::type Less_or_equal_lexicographically_d; - // FIXME: and vectors? - typedef typename Get_functor::type Orientation_d; - typedef typename Get_functor::type Less_coordinate_d; - typedef typename Get_functor::type Point_dimension_d; - typedef typename Get_functor::type Side_of_oriented_sphere_d; - typedef typename Get_functor::type Power_side_of_power_sphere_d; - typedef typename Get_functor::type Power_center_d; - typedef typename Get_functor::type Power_distance_d; - typedef typename Get_functor::type Contained_in_affine_hull_d; - typedef typename Get_functor::type Construct_flat_orientation_d; - typedef typename Get_functor::type In_flat_orientation_d; - typedef typename Get_functor::type In_flat_side_of_oriented_sphere_d; - typedef typename Get_functor::type In_flat_power_side_of_power_sphere_d; - typedef typename Get_functor::type Point_to_vector_d; - typedef typename Get_functor::type Vector_to_point_d; - typedef typename Get_functor::type Translated_point_d; - typedef typename Get_functor::type Scaled_vector_d; - typedef typename Get_functor::type Difference_of_vectors_d; - typedef typename Get_functor::type Difference_of_points_d; - //typedef typename Get_functor >::type Construct_point_d; - struct Construct_point_d : private Store_kernel { - typedef Kernel R_; // for the macro - CGAL_FUNCTOR_INIT_STORE(Construct_point_d) - typedef typename Get_functor >::type CP; - typedef Point_d result_type; - Point_d operator()(Weighted_point_d const&wp)const{ - return typename Get_functor::type(this->kernel())(wp); - } -#ifdef CGAL_CXX11 - Point_d operator()(Weighted_point_d &wp)const{ - return typename Get_functor::type(this->kernel())(wp); - } - Point_d operator()(Weighted_point_d &&wp)const{ - return typename Get_functor::type(this->kernel())(std::move(wp)); - } - Point_d operator()(Weighted_point_d const&&wp)const{ - return typename Get_functor::type(this->kernel())(std::move(wp)); - } - template -# if __cplusplus >= 201402L - decltype(auto) -# else - Point_d -# endif - operator()(T&&...t)const{ - return CP(this->kernel())(std::forward(t)...); - //return CP(this->kernel())(t...); - } -#else -# define CGAL_CODE(Z,N,_) template \ - Point_d operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,const&t))const{ \ - return CP(this->kernel())(BOOST_PP_ENUM_PARAMS(N,t)); \ - } - BOOST_PP_REPEAT_FROM_TO(1,11,CGAL_CODE,_) -# undef CGAL_CODE - Point_d operator()()const{ \ - return CP(this->kernel())(); \ - } -#endif - }; - typedef typename Get_functor >::type Construct_vector_d; - typedef typename Get_functor >::type Construct_segment_d; - typedef typename Get_functor >::type Construct_sphere_d; - typedef typename Get_functor >::type Construct_hyperplane_d; - typedef Construct_vector_d Construct_direction_d; - typedef typename Get_functor >::type Construct_line_d; - typedef typename Get_functor >::type Construct_ray_d; - typedef typename Get_functor >::type Construct_iso_box_d; - typedef typename Get_functor >::type Construct_aff_transformation_d; - typedef typename Get_functor >::type Construct_weighted_point_d; - typedef typename Get_functor::type Midpoint_d; - struct Component_accessor_d : private Store_kernel { - typedef Kernel R_; // for the macro - CGAL_FUNCTOR_INIT_STORE(Component_accessor_d) - int dimension(Point_d const&p){ - return this->kernel().point_dimension_d_object()(p); - } - FT cartesian(Point_d const&p, int i){ - return this->kernel().compute_coordinate_d_object()(p,i); - } - RT homogeneous(Point_d const&p, int i){ - if (i == dimension(p)) - return 1; - return cartesian(p, i); - } - }; - struct Construct_cartesian_const_iterator_d : private Store_kernel { - CGAL_FUNCTOR_INIT_STORE(Construct_cartesian_const_iterator_d) - typedef typename Get_functor >::type CPI; - typedef typename Get_functor >::type CVI; - // FIXME: The following sometimes breaks compilation. The typedef below forces instantiation of this, which forces Point_d, which itself (in the wrapper) needs the derived kernel to tell it what the base kernel is, and that's a cycle. The exact circumstances are not clear, g++ and clang++ are ok in both C++03 and C++11, it is only clang in C++11 without CGAL_CXX11 that breaks. For now, rely on result_type. - //typedef typename CGAL::decay::type>::type result_type; - typedef typename CGAL::decay::type result_type; - // Kernel_d requires a common iterator type for points and vectors - // TODO: provide this mixed functor in preKernel? - //CGAL_static_assertion((boost::is_same::type>::type, result_type>::value)); - CGAL_static_assertion((boost::is_same::type, result_type>::value)); - template - result_type operator()(Point_d const&p, Tag_ t)const{ - return CPI(this->kernel())(p,t); - } - template - result_type operator()(typename First_if_different::Type const&v, Tag_ t)const{ - return CVI(this->kernel())(v,t); - } - - template - result_type operator()(Obj const&o)const{ - return operator()(o, Begin_tag()); - } - result_type operator()(Point_d const&p, int)const{ - return operator()(p, End_tag()); - } - result_type operator()(typename First_if_different::Type const&v, int)const{ - return operator()(v, End_tag()); - } - }; - struct Compute_squared_radius_d : private Store_kernel { - typedef Kernel R_; // for the macro - CGAL_FUNCTOR_INIT_STORE(Compute_squared_radius_d) - typedef FT result_type; - template FT operator()(CGAL_FORWARDABLE(S) s)const{ - return typename Get_functor::type(this->kernel())(CGAL_FORWARD(S,s)); - } - template FT operator()(I b, I e)const{ - return typename Get_functor::type(this->kernel())(b,e); - } - }; - typedef typename Construct_cartesian_const_iterator_d::result_type Cartesian_const_iterator_d; - typedef typename Get_functor::type Squared_distance_d; - typedef typename Get_functor::type Squared_length_d; - typedef typename Get_functor::type Scalar_product_d; - typedef typename Get_functor::type Affine_rank_d; - typedef typename Get_functor::type Affinely_independent_d; - typedef typename Get_functor::type Contained_in_linear_hull_d; - typedef typename Get_functor::type Contained_in_simplex_d; - typedef typename Get_functor::type Has_on_positive_side_d; - typedef typename Get_functor::type Linear_rank_d; - typedef typename Get_functor::type Linearly_independent_d; - typedef typename Get_functor::type Oriented_side_d; - typedef typename Get_functor::type Side_of_bounded_sphere_d; - - typedef typename Get_functor::type Center_of_sphere_d; - typedef Center_of_sphere_d Construct_center_d; // RangeSearchTraits - typedef typename Get_functor::type Construct_circumcenter_d; - typedef typename Get_functor::type Value_at_d; - typedef typename Get_functor::type Point_of_sphere_d; - typedef typename Get_functor::type Orthogonal_vector_d; - typedef typename Get_functor::type Linear_base_d; - typedef typename Get_functor::type Construct_min_vertex_d; - typedef typename Get_functor::type Construct_max_vertex_d; - - typedef typename Get_functor::type Compute_weight_d; - typedef typename Get_functor::type Point_drop_weight_d; - - //TODO: - //typedef ??? Intersect_d; - - - Compute_coordinate_d compute_coordinate_d_object()const{ return Compute_coordinate_d(*this); } - Has_on_positive_side_d has_on_positive_side_d_object()const{ return Has_on_positive_side_d(*this); } - Compare_lexicographically_d compare_lexicographically_d_object()const{ return Compare_lexicographically_d(*this); } - Equal_d equal_d_object()const{ return Equal_d(*this); } - Less_lexicographically_d less_lexicographically_d_object()const{ return Less_lexicographically_d(*this); } - Less_or_equal_lexicographically_d less_or_equal_lexicographically_d_object()const{ return Less_or_equal_lexicographically_d(*this); } - Less_coordinate_d less_coordinate_d_object()const{ return Less_coordinate_d(*this); } - Orientation_d orientation_d_object()const{ return Orientation_d(*this); } - Oriented_side_d oriented_side_d_object()const{ return Oriented_side_d(*this); } - Point_dimension_d point_dimension_d_object()const{ return Point_dimension_d(*this); } - Point_of_sphere_d point_of_sphere_d_object()const{ return Point_of_sphere_d(*this); } - Side_of_oriented_sphere_d side_of_oriented_sphere_d_object()const{ return Side_of_oriented_sphere_d(*this); } - Power_side_of_power_sphere_d power_side_of_power_sphere_d_object()const{ return Power_side_of_power_sphere_d(*this); } - Power_center_d power_center_d_object()const{ return Power_center_d(*this); } - Power_distance_d power_distance_d_object()const{ return Power_distance_d(*this); } - Side_of_bounded_sphere_d side_of_bounded_sphere_d_object()const{ return Side_of_bounded_sphere_d(*this); } - Contained_in_affine_hull_d contained_in_affine_hull_d_object()const{ return Contained_in_affine_hull_d(*this); } - Contained_in_linear_hull_d contained_in_linear_hull_d_object()const{ return Contained_in_linear_hull_d(*this); } - Contained_in_simplex_d contained_in_simplex_d_object()const{ return Contained_in_simplex_d(*this); } - Construct_flat_orientation_d construct_flat_orientation_d_object()const{ return Construct_flat_orientation_d(*this); } - In_flat_orientation_d in_flat_orientation_d_object()const{ return In_flat_orientation_d(*this); } - In_flat_side_of_oriented_sphere_d in_flat_side_of_oriented_sphere_d_object()const{ return In_flat_side_of_oriented_sphere_d(*this); } - In_flat_power_side_of_power_sphere_d in_flat_power_side_of_power_sphere_d_object()const{ return In_flat_power_side_of_power_sphere_d(*this); } - Point_to_vector_d point_to_vector_d_object()const{ return Point_to_vector_d(*this); } - Vector_to_point_d vector_to_point_d_object()const{ return Vector_to_point_d(*this); } - Translated_point_d translated_point_d_object()const{ return Translated_point_d(*this); } - Scaled_vector_d scaled_vector_d_object()const{ return Scaled_vector_d(*this); } - Difference_of_vectors_d difference_of_vectors_d_object()const{ return Difference_of_vectors_d(*this); } - Difference_of_points_d difference_of_points_d_object()const{ return Difference_of_points_d(*this); } - Affine_rank_d affine_rank_d_object()const{ return Affine_rank_d(*this); } - Affinely_independent_d affinely_independent_d_object()const{ return Affinely_independent_d(*this); } - Linear_base_d linear_base_d_object()const{ return Linear_base_d(*this); } - Linear_rank_d linear_rank_d_object()const{ return Linear_rank_d(*this); } - Linearly_independent_d linearly_independent_d_object()const{ return Linearly_independent_d(*this); } - Midpoint_d midpoint_d_object()const{ return Midpoint_d(*this); } - Value_at_d value_at_d_object()const{ return Value_at_d(*this); } - /// Intersect_d intersect_d_object()const{ return Intersect_d(*this); } - Component_accessor_d component_accessor_d_object()const{ return Component_accessor_d(*this); } - Orthogonal_vector_d orthogonal_vector_d_object()const{ return Orthogonal_vector_d(*this); } - Construct_cartesian_const_iterator_d construct_cartesian_const_iterator_d_object()const{ return Construct_cartesian_const_iterator_d(*this); } - Construct_point_d construct_point_d_object()const{ return Construct_point_d(*this); } - Construct_vector_d construct_vector_d_object()const{ return Construct_vector_d(*this); } - Construct_segment_d construct_segment_d_object()const{ return Construct_segment_d(*this); } - Construct_sphere_d construct_sphere_d_object()const{ return Construct_sphere_d(*this); } - Construct_hyperplane_d construct_hyperplane_d_object()const{ return Construct_hyperplane_d(*this); } - Compute_squared_radius_d compute_squared_radius_d_object()const{ return Compute_squared_radius_d(*this); } - Squared_distance_d squared_distance_d_object()const{ return Squared_distance_d(*this); } - Squared_length_d squared_length_d_object()const{ return Squared_length_d(*this); } - Scalar_product_d scalar_product_d_object()const{ return Scalar_product_d(*this); } - Center_of_sphere_d center_of_sphere_d_object()const{ return Center_of_sphere_d(*this); } - Construct_circumcenter_d construct_circumcenter_d_object()const{ return Construct_circumcenter_d(*this); } - Construct_direction_d construct_direction_d_object()const{ return Construct_direction_d(*this); } - Construct_line_d construct_line_d_object()const{ return Construct_line_d(*this); } - Construct_ray_d construct_ray_d_object()const{ return Construct_ray_d(*this); } - Construct_iso_box_d construct_iso_box_d_object()const{ return Construct_iso_box_d(*this); } - Construct_aff_transformation_d construct_aff_transformation_d_object()const{ return Construct_aff_transformation_d(*this); } - Construct_min_vertex_d construct_min_vertex_d_object()const{ return Construct_min_vertex_d(*this); } - Construct_max_vertex_d construct_max_vertex_d_object()const{ return Construct_max_vertex_d(*this); } - Construct_weighted_point_d construct_weighted_point_d_object()const{ return Construct_weighted_point_d(*this); } - - Compute_weight_d compute_weight_d_object()const{ return Compute_weight_d(*this); } - Point_drop_weight_d point_drop_weight_d_object()const{ return Point_drop_weight_d(*this); } - - // Dummies for those required functors missing a concept. - typedef Null_functor Position_on_line_d; - Position_on_line_d position_on_line_d_object()const{return Null_functor();} - typedef Null_functor Barycentric_coordinates_d; - Barycentric_coordinates_d barycentric_coordinates_d_object()const{return Null_functor();} - - /* Not provided because they don't make sense here: - Lift_to_paraboloid_d - Project_along_d_axis_d - */ -}; -} - -#endif // CGAL_KD_KERNEL_D_INTERFACE_H -- cgit v1.2.3