Commit Graph

573 Commits

Author SHA1 Message Date
Laurent Rineau 8ac23b392a Fix PR #4406 with C++03 2020-01-07 14:45:36 +01:00
Sébastien Loriot 530fa6be62 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-12-20 09:48:05 +01:00
Sebastien Loriot 141dda4290
Merge pull request #4384 from maxGimeno/Aff_transformation_3-Fix_include-maxGimeno
Fix Aff_transformation_3 missing includes
2019-12-20 09:44:24 +01:00
Laurent Rineau 617878b063 Merge pull request #4406 from afabri/Triangulation_2-fix_Projection_traits-GF
Triangulation_2:  Projection_traits::Construct_bbox_2 must return Bbox_2
2019-12-17 09:14:23 +01:00
Andreas Fabri 4d4b891362 T2: Projection_traits::Construct_bbox_2 must return Bbox_2 2019-12-13 15:47:43 +01:00
Maxime Gimeno a5917098ba Add missing stream includes 2019-11-29 09:16:00 +01:00
Maxime Gimeno b36a1bd18c Add mnissing <iostream> 2019-11-29 09:14:11 +01:00
Andreas Fabri cc75efdbb5 Add static filter for Coplanar_3 2019-11-07 15:57:23 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Sébastien Loriot 1b00fd3f54 use Variadic templates 2019-09-19 23:11:04 +02:00
Andreas Fabri 0f267c53e3 Make 2d segment segment distance more robust for kernel without exact constructions 2019-08-29 14:54:03 +02:00
Laurent Rineau 3e4b177506 Merge pull request #4116 from MaelRL/Kernel_23-Generalize_ray_point_method-GF
Change ray_23 and line_23's point(int) function to point(FT)
2019-08-19 12:54:38 +02:00
Laurent Rineau 0d7fd463ff Merge pull request #4116 from MaelRL/Kernel_23-Generalize_ray_point_method-GF
Change ray_23 and line_23's point(int) function to point(FT)
2019-08-19 12:53:59 +02:00
Mael Rouxel-Labbé 8bd73646b4 Fix for the case of using a kernel whose FT == RT == int 2019-07-29 08:51:32 +02:00
Mael Rouxel-Labbé a45ccab351 Distinguish between FT and RT so that Homogeneous uses RT-based vector scaling 2019-07-26 19:20:32 +02:00
Mael Rouxel-Labbé 6c8a8f347d Change ray/line.point(int --> FT)
There is no real requirement on it being an 'int', except some symmetry with
the segment.
2019-07-26 15:59:52 +02:00
Laurent Rineau 3d1450b71f Merge branch 'releases/CGAL-4.14-branch' 2019-07-23 17:17:06 +02:00
Laurent Rineau 8ce9207d10 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-23 17:14:40 +02:00
Mael Rouxel-Labbé bb640d2883 Revert "Add Epick_without_intervals"
This reverts commit 621542afbd.

`Static_filters` actually inherits wraps the kernel with `Filtered_kernel_base`
and as such, the exact kernel is still a filtered kernel using intervals.
Possible fixes for the implementation of EPICK_without_intervals are discussed
in https://github.com/CGAL/cgal/pull/3939.
2019-07-18 17:00:46 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Laurent Rineau 8fd3f2d8fd Merge pull request #3973 from sgiraudot/Kernel_23-Add_hash_functions-GF
[Small Feature] Add hash functions for kernel objects
2019-06-20 14:21:09 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +02:00
Laurent Rineau b0f1f90a4d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-20 14:08:25 +02:00
Simon Giraudot c3c825519c Add missing inlines 2019-06-06 09:51:10 +02:00
Simon Giraudot 72ea50ae77 Change condition on FT/Kernel for hash functions 2019-06-05 10:50:08 +02:00
Simon Giraudot 070a26a5b7 Fix missing inclusions + ADL for hash_value 2019-06-05 10:43:28 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Simon Giraudot 9ee478139b Remove hash for Direction_23/Ray_23 as equality is more complicated 2019-06-04 13:26:05 +02:00
Simon Giraudot d88b7bab69 Hash functions for many kernel objects 2019-06-03 15:56:07 +02:00
Simon Giraudot a954fbf69e Add hash function for Point_3 2019-06-03 14:36:32 +02:00
Laurent Rineau 621542afbd Add Epick_without_intervals
That `Epick` without the dynamic filters: only the static filters are
applied before the exact computation.
2019-05-16 15:10:40 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Andreas Fabri e60f69e669 Compute sqrt only once 2019-04-11 09:48:32 +02:00
Andreas Fabri 42af962bc2 Add overload for two vectors 2019-04-11 09:48:32 +02:00
Andreas Fabri 0e75cea23c Simplify the code 2019-04-11 09:48:30 +02:00
Andreas Fabri d62d88196e Add a function to compute the angle between three 3D points 2019-04-11 09:48:30 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot 1d908c1c0b remove code for CGAL_INTERSECTION_VERSION 1 2019-03-29 13:28:32 +01:00
Sébastien Loriot 82c13e6e74 remove cpp11 workaround in kernel related packages 2019-03-29 10:41:50 +01:00
Andreas Fabri 9cc37e1371 Add a subsection in the User Manual 2019-03-27 16:52:34 +01:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00
Sébastien Loriot d05df530b3 Merge pull request #2658 from MaelRL/Periodic_3_mesh_3-Feature-MBogdanov
Periodic_3_mesh_3, new package
2018-07-25 18:55:12 +02:00
Laurent Rineau 0585ffcc39 Merge pull request #3232 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points (cont.)
2018-07-20 17:20:16 +02:00
Laurent Rineau 87517ac68d Fix Bbox_[23]::dilate
`boost::math::float_advance` does not modify its argument, but returns a
value! The previous version of the code was not modifying the bbox at all,
and the point snapping was active.
2018-07-13 17:01:10 +02:00
Mael Rouxel-Labbé fd076c3c6d Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-28 16:25:54 +02:00
Sébastien Loriot 0abfba8ac0 Update branch 'PMP-coref_preserve_face_attributes' from master@5ceb529d0f 2018-06-21 10:53:59 +02:00
Mael Rouxel-Labbé 7490f34560 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-21 10:15:25 +02:00
Laurent Rineau 786f85c93b Merge pull request #3168 from MaelRL/Kernel23-Fix_weighted_point_translate_doc-GF
Kernel_23: Fix some doc issue with weighted points
2018-06-20 17:20:53 +02:00
Mael Rouxel-Labbé d4011f3f1f Fixed result_of function signature 2018-06-13 10:37:24 +02:00
Mael Rouxel-Labbé ddeb4c0cd7 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-07 15:14:19 +02:00
Laurent Rineau 7f45dbebe6 Merge pull request #3058 from maxGimeno/Property_map-Point_kernel_converter_map-GF
Property_map: Kernel_converter_map
2018-06-06 14:41:46 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Sébastien Loriot 0202bc879e add an extra operator for plane-line(pt,pt) 2018-06-04 17:21:01 +02:00
Laurent Rineau aa38a024c2 Merge pull request #3098 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points
2018-06-01 17:26:16 +02:00
Andreas Fabri 8fa2670526 fix Bbox_2::dilate() 2018-05-30 14:34:34 +02:00
Andreas Fabri 1123afb70e Add Bbox_{2,3}.dilate(int) so that the snapping in the CT_2 also works with Projection_traits classes 2018-05-30 14:34:34 +02:00
Laurent Rineau cb14375778
Merge branch 'master' into Property_map-Point_kernel_converter_map-GF 2018-05-29 10:58:28 +02:00
Andreas Fabri 0d3ac75518 Introduce namespace Intersections 2018-05-04 08:57:56 +02:00
Andreas Fabri 42762b7efb Add do_intersect(Iso_cuboid_3, Plane_3/Triangle_3) 2018-05-04 08:57:53 +02:00
Sébastien Loriot 8bc315c974 make it work with any Kernel object 2018-05-03 15:05:47 +02:00
Maxime Gimeno 67ca3f9dcb fixes 2018-04-27 09:18:48 +02:00
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Maxime Gimeno b20d0e0908 Optimization 2018-04-26 10:02:43 +02:00
Maxime Gimeno bcfb7afead Add an operator for a Ray_3 to ConstructProjectedpoint_3 2018-04-25 15:32:36 +02:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Mael Rouxel-Labbé c28e05be0c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 12:50:06 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Andreas Fabri 2e14ff9f04 Kernel 2018-01-17 19:59:11 +00:00
Mael Rouxel-Labbé 0bca01d872 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-19 17:22:03 +01:00
Laurent Rineau f2391a30a5 Merge pull request #2562 from afabri/Filtered_kernel-Do_intersect_2-GF
Add Static Filters for the Exact Construction Kernel
2017-12-19 16:29:53 +01:00
Mael Rouxel-Labbé add23592de Fixed license/tag issues 2017-12-08 10:02:26 +01:00
Mael Rouxel-Labbé c18e005cd4 Added a couple of missing tags 2017-12-05 17:20:46 +01:00
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau d60379266b Revert "Improvement: add static filters to Lazy_kernel"
This reverts commit 8eac6ca650.

Now Epeck automatically falls back to using Epick predicates when the
objects have trivial approximations.
2017-10-31 12:14:01 +01:00
Andreas Fabri 2f95a05e1c make filtering with static filter generic 2017-10-27 15:27:20 +01:00
Mael Rouxel-Labbé 1f4475d471 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-10-27 16:26:27 +02:00
Laurent Rineau 9076ecaddf Add K::Has_on_bounded_side_3(Sphere_3, Sphere_3, Point_3, Point_3) 2017-10-13 15:57:02 +02:00
Mael Rouxel-Labbé b8de2148b2 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-07-28 11:41:58 +02:00
Andreas Fabri 5573e5d15e Is_degenerate_{2,3} and Collinear_{2,3} are division free 2017-07-11 20:31:28 +02:00
Laurent Rineau d878561809 Merge pull request #2102 from afabri/Kernel_Weighted_point_without_conversion-GF
Remove implicit conversions between points and weighted points
2017-07-03 12:08:57 +02:00
Mael Rouxel-Labbé acac4f7135 Added new class: Has_conversion
Used to check whether a Kernel converter (either Cartesian_converter or
Homogeneous_converter) provides the necessary functor T1 operator()(T2)
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 11786a7b90 Fixed minor mistakes from a rebase 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 6825ae2197 Made Kernel_checker work with constructions
Basically, use the same Pairify class to deduce the return type.
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 73f4a3d6cc Removed an empty line 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e88b643874 Removed ambiguous weighted point constructor
This constructor was already cleaned in the branch that this branch
is based upon... I must have messed up a merge conflict...
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e95d3d3f2b Make all conversions between Point and Weighted_point explicit
Also doc changes
2017-06-28 10:14:35 +02:00
Andreas Fabri d73be575f5 Do in 2D what we did in 3D 2017-06-28 10:14:35 +02:00
Jane Tournois 6ec4669937 fix compilation of tests wrt Point vs Weighted point 2017-06-28 10:14:35 +02:00
Andreas Fabri b949b667ab Use Construct_point_3 inside functor 2017-06-28 10:14:35 +02:00
Andreas Fabri bb213d5ad1 Changes after making Weighted_point_3(const Point_3) explicit 2017-06-28 10:14:35 +02:00
Andreas Fabri 2f895335d0 The Weighted_point_mapper becomes a traits class; test_regular_3.cpp passes 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 12f5cf82ee Fixed cubic equation solver 2017-06-22 16:14:55 +02:00
Mael Rouxel-Labbé 7c014c9e27 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
Based on cgal-public-dev/Periodic_3_Regular...
  @ 7efd46f427580437943fa549bdbf1159f35b1edb
2017-06-16 11:21:52 +02:00
Mael Rouxel-Labbé 7da382a285 Added new class: Has_conversion
Used to check whether a Kernel converter (either Cartesian_converter or
Homogeneous_converter) provides the necessary functor T1 operator()(T2)
2017-06-15 10:34:15 +02:00