Commit Graph

211 Commits

Author SHA1 Message Date
Sébastien Loriot 8b4118912d extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:21 +01:00
Sébastien Loriot fedc29e23c Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:57:54 +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
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Maxime Gimeno d395e096f2 fix warnings 2020-03-20 10:55:29 +01:00
Maxime Gimeno fe0d4d0a6e more clean-up 2020-03-19 16:41:59 +01:00
Maxime Gimeno ce4cbe6d06 Fix licenses 2020-03-19 11:41:57 +01:00
Maxime Gimeno 8a6bdd90b3 Fix after review 2020-03-19 11:31:35 +01:00
Maxime Gimeno 0f3305f983 Enhancements after review 2020-01-16 17:20:13 +01:00
Maxime Gimeno 90d2e03fdc Merge remote-tracking branch 'cgal/master' into Intersections_23-Add_missing_intersections-GF 2020-01-15 13:32:11 +01:00
Mael Rouxel-Labbé a5f09f89a6 Partial code cleaning (and fix some typedefs) 2019-10-22 12:36:58 +02:00
Maxime Gimeno e9a0b2d695 Fixes after review 2019-10-21 15:51:36 +02: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
Maxime Gimeno 3c875e8a18 WIP review 2019-10-04 15:30:52 +02:00
Maxime Gimeno 9ede1f3ee7 Specialize the cw test to be more robust if the kernel is not exact 2019-10-03 10:53:28 +02:00
Maxime Gimeno ad3c3d16b7 Use left_turn() instead of custom inefficient function. 2019-10-02 15:24:18 +02:00
Maxime Gimeno 7de9465bbb Optimize for triangle intersections 2019-10-02 15:11:08 +02:00
Maxime Gimeno 245b2211e6 Add a cw test before returning the triangle or polygon result of a triangle/XXX intersection. 2019-07-30 11:50:25 +02:00
Maxime Gimeno 290b6db143 Merge remote-tracking branch 'cgal/master' into Intersections_23-Add_missing_intersections-GF 2019-07-30 09:51:28 +02:00
Maxime Gimeno 4f796c9ab5 Add missing do_intersect() and associated tests 2019-07-09 11:47:01 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau b18a17eba7 Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h
2019-07-01 11:13:42 +02:00
Mael Rouxel-Labbé c78f1ef812 Remove superfluous 'typename's 2019-06-26 15:57:32 +02:00
Maxime Gimeno b9d33c7ffa Fix Conflicts 2019-06-25 13:25:57 +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 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Maxime Gimeno 443f3f636f Add missing intersection_2 and update doc. 2019-06-13 15:49:21 +02:00
Maxime Gimeno 119ca0dff8 Add Intersection between Bbox_3 and Bbox_3 2019-06-13 10:26:28 +02:00
Mael Rouxel-Labbé ec48c4c3ad Enforce correct bit precision
Necessary for some old machines whose processor violates the standard
2019-06-03 10:30:04 +02:00
Mael Rouxel-Labbé 128eb72121 Remove obsolete todo in std::cout in 2D intersection tests 2019-06-03 07:57:16 +02:00
Mael Rouxel-Labbé 1202692394 Add a test 2019-05-24 08:14:56 +02:00
Mael Rouxel-Labbé 47b14e656d Fix order of checks to avoid calling back() on an empty vector 2019-05-24 08:14:12 +02:00
Mael Rouxel-Labbé 38afb85b61 Fix broken Bbox_2_ray/line by basing them on Iso_rectangle_2
Removes the intersection(bbox_2, ray/line), but:
- it was broken
- it was undocumented

If it's needed, just use an Iso_rectangle instead.
2019-05-20 10:54:17 +02:00
Mael Rouxel-Labbé ad1fbbd242 Fix Circle_2 -- Bbox_2/Iso_rectangle_2 intersection
Bbox_2 is inherently inexact as it is double-based. Thus, Bbox_2 should
use its conversion to Iso_rectangle_2 (a kernel type) and not the other way
around, otherwise we are doing FT --> double --> FT and losing precision.
2019-05-20 10:06:14 +02:00
Mael Rouxel-Labbé b322f685d4 Populate Intersections_2 tests 2019-05-17 14:48:04 +02:00
Mael Rouxel-Labbé e23d76cfab Cosmetic changes 2019-05-17 14:47:31 +02:00
Mael Rouxel-Labbé 325be3560b Fix Bbox_2 Circle_2 intersection (bbox within circle is not an intersection) 2019-05-17 12:18:22 +02:00
Mael Rouxel-Labbé 36c6c4ca4e Move Circle_2 Iso_rectangle_2 overload to the appropriate function 2019-05-17 12:18:12 +02:00
Mael Rouxel-Labbé ab0ca8a735 Use the intersection traits macro to simplify code (cosmetic change) 2019-05-17 12:15:48 +02:00
Mael Rouxel-Labbé 58c894ed5e Add missing free function for Bbox_2 Point_2 intersection 2019-05-17 12:15:22 +02:00
Mael Rouxel-Labbé 80d1f3f18a Clean a bit Bbox_2_Ray/Line_2 do intersect files (but the code is still wrong) 2019-05-17 12:14:43 +02:00
Mael Rouxel-Labbé e4f7c720c7 Merge branch 'Intersection_2-Fix_Ray_triangle_degenrate_inter-GF' into Intersections_2-Populate_tests-GF 2019-05-16 15:09:23 +02:00
Mael Rouxel-Labbé 845002d7bf Populate existing Intersections_2 tests with missing cases 2019-05-16 14:07:33 +02:00
Mael Rouxel-Labbé bf8097dd6f Fix Triangle_2 Iso_rectangle_2 intersection
std::unique does not handle the case where points are identical at the beginning
and the end of the vector
2019-05-16 14:06:46 +02:00
Mael Rouxel-Labbé 90ba79493f Fix Ray_2 Triangle_2 intersection when the intersection is a point 2019-05-16 14:03:30 +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
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00