Commit Graph

539 Commits

Author SHA1 Message Date
Sébastien Loriot a943082eff Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:01:31 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sebastien Loriot 6b2b1e8470
Merge pull request #4238 from sloriot/sloriot/CGAL-Variadics
use Variadic templates
2020-03-17 18:21:56 +01:00
Laurent Rineau 4ec82f4b09 Merge pull request #4540 from mglisse/handle
Some noexcept, swap, etc to help Handle* types
2020-03-05 14:52:09 +01:00
Laurent Rineau 0260afee8c Merge pull request #4542 from sloriot/Kernel-compare_distance_use_FT
Use FT instead of RT
2020-03-05 14:52:06 +01:00
Laurent Rineau 0d393fb8db Merge pull request #4542 from sloriot/Kernel-compare_distance_use_FT
Use FT instead of RT
2020-03-05 14:50:42 +01:00
Marc Glisse 3ebe8839b6 swap for Point_2 and Point_d
and make the implementations more similar, in case someone wants to
replace it with a macro at some point.
2020-03-01 12:50:13 +01:00
Andreas Fabri 99eea7ac21 Add operator for line/point/point 2020-02-25 16:47:12 +00:00
Sébastien Loriot ba2f2c1c20 use FT instead of RT
Compare_distance_3 is a generic functor that is comparing
the returned value of Squared_distance_3. If called to
compare the distance of a point to a plane/segment/triangle
a division is used leading to runtime error.
2020-02-25 14:25:20 +01:00
Marc Glisse 1eed5a908c swap Simple_cartesian<Gmpq>::Point_3 2020-02-25 08:57:53 +01:00
Marc Glisse c92587fb9c More swap
We could add it for all kernel wrappers...
It is really inconvenient that swap cannot be autogenerated like move
assignments are.
noexcept(auto) would also be convenient, whatever some people on the
committee claim.
2020-02-25 02:00:48 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +01:00
Mael Rouxel-Labbé 4536ea4f53 Clean whitespace (no changes) 2020-01-16 12:33:01 +01:00
Laurent Rineau 88d35455e2 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-01-07 14:46:27 +01:00
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