songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
91,711 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

855 Commits

Author SHA1 Message Date
Laurent Rineau d19f79ee0d Merge pull request #4163 from MaelRL/T2-Throw_on_collinear_strongly_intersecting_segments-GF 
CDT2: Throw on constraint intersections that do not require constructions
 2019-12-05 11:05:47 +01:00
Laurent Rineau b5b507c35f Merge pull request #4213 from lrineau/T2-cleanup_Polyline_constraint_hierarchy_2-GF 
Polyline_constraint_hierarchy_2.h: remove the useless point_ data member
 2019-12-05 11:05:41 +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 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02: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 962e8b10a6
Fix typo 2019-10-03 08:12:16 +02:00
Mael Rouxel-Labbé ea8e6f3c98 Update CDT2 intersection tag documentation 2019-09-19 18:32:58 +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
Laurent Rineau 502945633c Rename Data to Point, because it must be the type of Vertex::point() 2019-09-10 12:42:03 +02:00
Laurent Rineau b1df25dcf6 Remove the useless point_ data member 2019-09-09 15:49:33 +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
Mael Rouxel-Labbé f3ccb18da0 Fix typo 2019-08-19 17:18:55 +02:00
Mael Rouxel-Labbé 869baed46f Fix not throwing on overlapping constraints 2019-08-19 17:18:29 +02:00
Sébastien Loriot b84297f8f6 update the usage for the new CGAL named function parameters 2019-07-29 09:38:39 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master 
Conflicts resolved by hand
 2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch 
Conflicts resolved by hand
 2019-07-28 22:30:13 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF 
PMP: Add locate.h and rewrite Triangulation_2 graph traits
 2019-07-18 16:40:49 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand 
CGAL: more viewers
 2019-07-10 14:22:50 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +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 aeac816801 Triangulation_2: Fix remove_vertex_from_constraint-GF 2019-06-26 14:34:41 +02:00
Andreas Fabri c1f337d585 Triangulation_2: Fix CDT_plus_2::remove_constraint() 2019-06-20 12:17:15 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Mael Rouxel-Labbé d75821f27a Rename template parameter to help MSVC 
Seems like MSVC gets confused between 'Tr' being both a template paramter
and a typedef in the class being passed as template parameter.
 2019-06-17 08:33:23 +02:00
Andreas Fabri 1e1bfa1675 constness 2019-06-15 22:30:47 +02:00
Mael Rouxel-Labbé a189e82686 Cache a descriptor within the iterators so operator*() can return a reference 2019-06-14 10:47:20 +02:00
Mael Rouxel-Labbé 0ea40f7602 Add missing 'const' in conversion operator 2019-06-14 10:46:46 +02:00
Andreas Fabri 7a49b48019 Add code and test for all_edges() 2019-06-12 09:23:57 +02:00
Andreas Fabri c34536be24
Apply suggestions from code review 
Co-Authored-By: Mael <mael.rouxel.labbe@geometryfactory.com>
 2019-06-05 17:26:37 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Laurent Rineau 39c8f7ae1f Merge pull request #3950 from afabri/Triangulation_23-PointWithInfo-GF 
2D and 3D Triangulations:  Unify insertion of range of points with info
 2019-06-05 11:20:23 +02:00
Andreas Fabri 7111518cb0 Fix usage of Vertices_in_constraint 2019-06-05 08:02:19 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +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
Andreas Fabri 785ae04e0b Add ranges to Regular_triangulation_2 2019-06-04 12:45:42 +02:00
Andreas Fabri f954b00063 Fix error 2019-05-24 11:32:32 +02:00
Andreas Fabri 7b4bad5666 Fix warnings 2019-05-24 11:14:58 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF 
Fix some typos in code/comments/documentation
 2019-05-23 08:50:14 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Andreas Fabri f354210be3 Add using statements 2019-05-21 14:32:03 +02:00
Andreas Fabri 85d9ec1ae1 Unify 2D 2019-05-20 17:30:31 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Sébastien Loriot e6d0080cc7 fix the init of the vertex index vector 2019-05-14 09:15:44 +02:00
Mael 0efaed2095
Merge branch 'master' into PMP-Locate-GF 2019-05-06 15:57:09 +02:00
Andreas Fabri 2287817654 Add using compare_y 2019-05-02 13:49:33 +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
Mael Rouxel-Labbé 9abef28840 Add missing operator< for T2 edge descriptors 
and removed useless comparators
 2019-04-29 16:05:51 +02:00
Mael Rouxel-Labbé ab092afe57 Include 2D triangulation BGL properties from BGL graph traits header 
for convenience
 2019-04-29 15:45:22 +02:00
Mael Rouxel-Labbé a03701d2b7 Fix key type in generic 2D triangulation BGL properties 2019-04-29 15:44:51 +02:00
Mael Rouxel-Labbé 9cba48acfe Fixed TDS graph traits implementation and factorized some parts with other T2 GT 2019-04-29 13:22:45 +02:00
Mael Rouxel-Labbé 64d7747f8b Moved factorized 2D graph traits to /internal 2019-04-29 13:21:46 +02:00
Mael Rouxel-Labbé 9a03b19bfa Fixed TDS2 graph traits to work without relying on halfedge hacks from TDS2.h 2019-04-29 12:21:42 +02:00
Mael Rouxel-Labbé 842ae3fbbd Change T2 graph traits to only use finite elements 
This is way more logical because infinite faces have corrupt geometry,
and do not present any particular use (if you want the convex hull, just
walk the border)

This is a breaking change, but the whole traits was so broken nobody could
have been using it in the first place anyway.
 2019-04-29 08:29:40 +02:00
Mael Rouxel-Labbé aa4e1913d1 Partial revert of 42a1c49066 
Halfedges in TDS2 and T2 were being used to get halfedges in the T2 graph traits
We now do it differently and without polluting the packages T2 and TDS2
 2019-04-29 08:29:40 +02:00
Mael Rouxel-Labbé 9f57d48642 Factorize T2 graphs' properties via macros 2019-04-24 13:14:09 +02:00
Mael Rouxel-Labbé d9a0baa442 Multiple fixes for T2 graph traits factorization 
(need independent iterator classes, make it work for RT2 despite RT2 having
a different vertex iterator, etc.)
 2019-04-24 13:12:48 +02:00
Mael Rouxel-Labbé 092286a8b8 Fixed grabbing non-existent 'Point' typedef from a face base class 2019-04-23 11:44:19 +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
Mael Rouxel-Labbé 62cb1b7283 Added class Triangulation_face_base_with_id_2 2019-04-23 10:32:59 +02:00
Mael Rouxel-Labbé 811810c02c Switch the three main triangulations' graph traits to a common version 2019-04-19 17:17:09 +02:00
Mael Rouxel-Labbé 09df9b5622 Added some common graph traits for all 2D triangulations 2019-04-19 17:14:52 +02:00
Mael Rouxel-Labbé 28a210837e Fixed missing vertex point pmap (+ property) in RT2 graph traits 2019-04-19 08:39:52 +02:00
Sebastien Loriot 7b01c13f8d
Merge pull request #2938 from afabri/Triangulation_2-internal-GF 
Triangulation_2: Cleanup of include/CGAL
 2019-04-18 15:51:15 +02:00
Sebastien Loriot 14ebc2fabc
Update Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h 
Co-Authored-By: afabri <andreas.fabri@geometryfactory.com>
 2019-04-18 13:54:46 +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
Sebastien Loriot 80cece608c
Merge pull request #3595 from MaelRL/T2-Remove_strict_conflict_zone_boolean-GF 
Triangulation_2: revert small feature DT2_strict_and_weak_conflict_zone
 2019-04-12 15:35:06 +02:00
Andreas Fabri 899364b87b Remove files that were deprecated in 4.9 2019-04-12 14:57:18 +02:00
Andreas Fabri 5fdcfc989f Merge branch 'master' into Triangulation_2-internal-GF 2019-03-22 11:55:22 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF 
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
 2019-02-13 15:25:07 +00:00
Laurent Rineau 82dd2b5cda Merge pull request #3669 from afabri/Triangulation_2-maybe_not_intialized-GF 
Triangulation_2: Initialize to avoid warning
 2019-02-13 15:38:25 +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
Sébastien Loriot e4cbae525c Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-01-31 11:25:26 +01:00
Sébastien Loriot 99d842401a Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2019-01-31 11:24:50 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF 
Intersections_3:  Add missing do_intersect() overloads
 2019-01-18 16:37:54 +01:00
Andreas Fabri 4bb714fd7b Fix OTR and T2 2019-01-18 10:34:47 +01:00
Mael Rouxel-Labbé 14150ef95c Revert commit b307771 ("bug fix for natural_neighbor_coordinates_2... 
... using a small feature in the conflict zone functions of
Delaunay_triangulation_2")

See concerns raised in the (not-actually-approved) small feature:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/DT2_strict_and_weak_conflict_zone
 2019-01-14 11:19:21 +01:00
Mael Rouxel-Labbé 502c28796d Clarify 'last' ==> 'top' 2019-01-11 13:56:06 +01:00
Andreas Fabri cf1d116d97 Remove files 2019-01-11 13:47:39 +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
Mael Rouxel-Labbé 28ce2a5240 Fixed stack order in non recursive conflict walking 
Edges must be output in a CCW order, which is achieved by walking ccw-ly first.
In the recursive function, we correctly call 'propagate(..., ccw(j))' first.
For the non-recursive version which uses a stack, then we must add 'ccw(j)'
last since the stack is a LIFO structure.
 2019-01-11 12:32:43 +01:00