Commit Graph

93 Commits

Author SHA1 Message Date
Andreas Fabri 48c462bf72 Change in CDTplus 2022-03-09 13:46:55 +00:00
Andreas Fabri 8501386fee
Update Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-02-03 08:33:12 +01:00
Andreas Fabri c30327c3ec Triangulation_2: Quiet a warning 2022-02-02 09:38:38 +00:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Sebastien Loriot bdc2f3e0db
Merge pull request #5076 from lrineau/Triangulation_2-improve_CDT_plus_2-GF
Triangulation_2: improve CDT_plus_2
2020-10-20 13:28:12 +02:00
Laurent Rineau e37c290841 Better debug messages 2020-10-15 15:08:21 +02:00
Laurent Rineau dcc4fb1cc1 Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
# Conflicts:
#	STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Sébastien Loriot f8414293d7 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:27:08 +01:00
Sébastien Loriot d1a323c730 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:24:14 +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
Simon Giraudot 5b8d92e08f First version of split_subconstraint_graph_into_constraints() 2020-02-17 10:28:02 +01:00
Laurent Rineau 20bb2c8428 Add move-semantic to CT_plus_2 and Tr_hierarchy_2 2020-01-31 16:28:07 +01:00
Laurent Rineau 94be80c2eb fix clang-tidy warnings 2020-01-31 16:27:41 +01:00
Andreas Fabri 48fedbae06 Typos: splitted -> split 2019-12-11 16:57:34 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +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
Mael Rouxel-Labbé 7a50939809 Deprecate No_intersection_tag
Introduce two new tags instead, to make the behavior change clearer.

Default tag for CDT2 is changed to keep the same behavior as before
(what was called 'No_intersection_tag' and is now called
'No_constraint_intersection_requiring_constructions_tag')
2019-09-19 18:11:33 +02:00
Mael Rouxel-Labbé 9b2a7f09d7 Merge branch 'T2-Throw_on_collinear_strongly_intersecting_segments-GF-old' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-09-19 15:50:49 +02:00
Mael Rouxel-Labbé e955c38215 Add a new tag allowing constraints to intersect if no construction is required 2019-08-22 12:44:16 +02:00
Mael Rouxel-Labbé 013272a466 Fix not throwing on T-like segment intersection (extremity on interior) 2019-08-19 17:55:39 +02:00
Mael Rouxel-Labbé 59e0e87e24 Readability (no real changes) 2019-08-19 17:55:26 +02:00
Laurent Rineau dbb1cb6c9b Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
Triangulation_{2,3):  Add ranges
2019-07-01 11:16:05 +02:00
Andreas Fabri 7111518cb0 Fix usage of Vertices_in_constraint 2019-06-05 08:02:19 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 22a8edd750 doc 2019-06-04 16:52:33 +02:00
Andreas Fabri 70720e224f Add documentation for T2 2019-06-04 16:32: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
Andreas Fabri a3d535c553 Fix compilation, Add documentation, Add test for IO 2019-05-02 10:41:12 +02:00
Andreas Fabri abdad1585b Add this-> when calling a function inherited from a temmplate parameter 2019-04-30 17:53:32 +02:00
Andreas Fabri e0c2222c1f Constrained_triangulation_plus_2: Fix I/O 2019-04-30 13:24:52 +02:00
Andreas Fabri 26b26ea506 Remove deprecated function 2019-04-30 12:21:06 +02:00
Andreas Fabri 4724e3a358 Remove deprecated function 2019-04-30 12:21:03 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00
Sébastien Loriot 0651c97fdd Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-04-23 10:45:27 +02:00
Andreas Fabri d3128e75e5 We need two versions of the insert_constraint() function,
- one for the old API where constraints were just a 2d segment
- and one for polylines
2019-04-18 13:52:34 +02:00
Andreas Fabri 5fdcfc989f Merge branch 'master' into Triangulation_2-internal-GF 2019-03-22 11:55:22 +01:00
Laurent Rineau 9e056880e8 Better warning fix: do not initialize, and use CGAL_assume
Let the variable uninitialized, and instruct the compiler that the
condition where `i` remains uninitialized is an error condition.
2019-02-08 09:46:24 +01:00
Andreas Fabri a0ebd79e9d Triangulation_2: Initialize to avoid warning 2019-02-08 08:39:27 +01:00
Andreas Fabri 7009079e0c Move files to include/CGAL/Triangulation_2/internal and remove deprecated files 2019-01-11 13:46:58 +01:00
Laurent Rineau 7c22eb11b2 Merge pull request #3271 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Implement the check that avoids to insert a constraint twice
2018-08-23 15:40:22 +02:00
Laurent Rineau 9afcd23be8 Implement the check that avoids to insert a constraint twice 2018-08-03 11:24:47 +02:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Laurent Rineau e72444ab60
Merge pull request #2709 from lrineau/CGAL-fix_merge_of_PR_2478-GF
Fix the merge of PR #2478 into releases/CGAL-4.11-branch
2018-01-22 10:06:21 +01:00
Andreas Fabri 6c791f161a Triangulation_2 2018-01-17 16:12:12 +00:00
Laurent Rineau 3c5e159d1f Merge pull request #2705 from afabri/patch-2
Triangulation_2: cleanup
2018-01-17 10:42:57 +01:00
Laurent Rineau 42b11ddf29 Revert the merge of PR #2478
This reverts the merge commit 46cc91e787 onto
488c3e2879.
2018-01-04 17:54:08 +01:00
Andreas Fabri 78a033122d
Triangulation_2: cleanup
Remove unused local variable.
2018-01-03 11:38:31 +01:00
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00