Commit Graph

935 Commits

Author SHA1 Message Date
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
Andreas Fabri 630066dd24 Fix Mesh_2 testsuite 2019-01-10 17:31:54 +01:00
Sébastien Loriot c2f7814f19 prevent maybe-uninitialized warnings
they were triggered by
`l1 = t.line_walk(POINT(xr_left, yr_top), POINT(xr_right, yr_top), hface1);`
in `CGAL/apply_to_range.h`

Seen when compiling targets:
  Constrained_Delaunay_triangulation_2
  Polyline_simplification_2
  Delaunay_triangulation_2
2018-11-24 14:42:26 +01:00
Sébastien Loriot 54381db68a fix -Wmaybe-uninitialized warnings 2018-11-12 19:27:53 +01:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00
Guillaume Damiand b45cf04fbf Align typedef 2018-10-15 14:20:30 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Laurent Rineau 531223bd11 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:50:25 +02: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
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 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand
Add basic viewers
2018-06-14 17:36:37 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand bc4eca82b3 Need double cast 2018-06-13 10:47:44 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno fdeb5621ca replace cast in unsigned long int to std::size_t to fix warnings. 2018-06-07 13:55:22 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +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
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
Laurent Rineau c151778454 Merge pull request #3122 from MaelRL/T23-Fix_functor_return_type-GF
Triangulation_23: fix wrong return type in spatial_sort functor

# Conflicts:
#	Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp
2018-06-01 17:24:23 +02:00
Laurent Rineau 0e9c09b4f4 Merge pull request #3098 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points
2018-06-01 17:21:58 +02:00
Laurent Rineau 72d2c8e1ef Merge pull request #3122 from MaelRL/T23-Fix_functor_return_type-GF
Triangulation_23: fix wrong return type in spatial_sort functor

# Conflicts:
#	Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp
2018-06-01 17:21:44 +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 c40d7124d0 Fix CDT_2 errors, using snapping of intersection points
When `Constrained_triangulation_2` computes the intersection of two
segments, with a floating-point number type, and with
`Exact_predicates_tag`, the computed intersection point is snapped to an
extremity of the two segments, if it is closest to 4 ulp (with the l-inf
distance).

That value `4` can be changed by defining the macro
`CGAL_CDT_2_INTERSECTION_SNAPPING_ULP_DISTANCE` to another value.
2018-05-30 14:34:34 +02:00
Maxime Gimeno 71d3514987 Fix Triangulation example 2018-05-29 12:05:57 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC)
* Update FindQGLViewel to add a target.
2018-05-29 11:11:49 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5d375eff74 Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand 206a8a7e58 Move t2 viewer in cgal namespace 2018-05-29 11:04:57 +02:00
Guillaume Damiand 3f15cf7307 Add basic viewer for t2 2018-05-29 11:02:00 +02:00
Mael Rouxel-Labbé e9d3b9767e Fixed taking a reference to a temporary (when using EPECK) 2018-05-28 15:43:45 +02:00
Laurent Rineau 2ad4781a05 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF
Infrastructure : Test compilation of headers
2018-05-28 13:58:19 +02:00
Andreas Fabri 718db41ca5 Duplicates in TDS_2 and T_2 2018-05-23 11:48:58 +02:00
Sébastien Loriot da7826077a Merge pull request #2746 from afabri/Interpolation-vertices_V2-GF
Small feature: Interpolation with vertices
2018-05-07 11:45:23 +02:00
Mael Rouxel-Labbé f66196062d Fixed missing macro around inexact_locate 2018-05-04 13:57:39 +02:00
Andreas Fabri 97b5c37b6e Fix includes 2018-05-04 09:00:11 +02:00
Sébastien Loriot ad813dc4fe improving the doc 2018-04-30 09:19:15 +02:00
Maxime Gimeno 5fa7181360 changes in displayed text. 2018-04-30 09:19:15 +02:00
Maxime Gimeno 50ffa39ba6 Remove duplicated overload 2018-04-30 09:19:15 +02:00
Maxime Gimeno 121e4c3c50 Replace Throw_on_intersection_tag by the existing No_intersection_tag 2018-04-30 09:19:15 +02:00
Maxime Gimeno 944b540c54 Rename exception 2018-04-30 09:19:15 +02:00
Maxime Gimeno 3165eb1971 add a specific macro to silence the new warning 2018-04-30 09:19:15 +02:00
Maxime Gimeno fe07a1973c add doc in the right place. 2018-04-30 09:19:15 +02:00
Maxime Gimeno 6266570fc3 Move information from cerr to compilation warning and add an exception thrown with a new documented tag 2018-04-30 09:19:14 +02:00
Mael Rouxel-Labbé c5f134c9ae Readability changes 2018-04-26 13:58:23 +02:00
Mael Rouxel-Labbé 9faf52a7f5 Removed deprecated, undocumented, unused functions in T_face_base_2 2018-04-26 13:23:19 +02:00
Mael Rouxel-Labbé a8e28b02c6 Specify default face base for DT2 2018-04-26 13:00:50 +02:00
Laurent Rineau 3c70f8bad0 Fix dependencies by moving files 2018-03-23 14:17:24 +01:00
Mael Rouxel-Labbé dafdafa0bb
Merge branch 'master' into BGL-doc_improvement-GF 2018-02-19 15:41:45 +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
Mael Rouxel-Labbé 28d55f8981
Merge branch 'master' into BGL-doc_improvement-GF 2018-02-15 11:32:50 +01:00
Laurent Rineau c6fe6876b4 Merge pull request #2786 from MaelRL/T2-Fix_graph_traits-GF
Triangulation_2: Fix template parameter in RT_2's graph traits
2018-02-14 15:33:48 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Mael Rouxel-Labbé 11b708527d Fixed missing functions and types 2018-02-08 18:19:47 +01:00
Mael Rouxel-Labbé f32e265648 Tr_Base > Triangulation_base to avoid a conflict with a typedef in the T2 hierarchy 2018-02-05 10:20:04 +01:00
Mael Rouxel-Labbé 2b82dc67d9 Fixed wrong template in regular_triangulation_2's graph traits 2018-02-02 14:25:47 +01:00
Laurent Rineau f310fc588d
Merge pull request #2690 from sgiraudot/Classification-ETHZ_random_forest-GF
Classification: ETHZ Random Forest
2018-02-01 17:35:30 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +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 e34529aa9a PSP 2018-01-17 21:17:51 +00: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
Laurent Rineau 5181cd7474 Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2017-12-19 16:19:22 +01:00
Laurent Rineau 200a56eb9e Merge pull request #2625 from afabri/Triangulation_2-derecursification-GF
Derecursify functions in Constrained Delaunay and Constrained Triangulation
2017-12-19 16:13:18 +01:00
Andreas Fabri ef3c8a638e fix indentation 2017-12-07 08:18:45 +00:00
Andreas Fabri 3572246411 fix the derucursification 2017-11-29 07:20:42 +00:00
Andreas Fabri 62b9e59fa1 Derecursify in Constrained_triangulation_plus_2 2017-11-28 15:12:41 +00:00
Andreas Fabri 029888f85c Derecursify insert_constraint(Vhandle,Vhandle); Increment depth of propagating_flip() 2017-11-23 15:50:26 +00:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 78b8873433 Merge pull request #2572 from sloriot/T2-BGL_missing_null_descriptors
Add missing null descriptor functions in graph_traits of triangulations
2017-11-15 16:48:23 +01:00
Laurent Rineau d825ea3734 Merge pull request #2572 from sloriot/T2-BGL_missing_null_descriptors
Add missing null descriptor functions in graph_traits of triangulations
2017-11-15 16:44:38 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Sébastien Loriot 196603fc8a add missing null descriptors in graph_traits of triangulations 2017-11-03 10:07:52 +01:00
Laurent Rineau 46cc91e787 Merge pull request #2478 from mtola/master
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
2017-10-13 17:06:22 +02:00
Laurent Rineau 8f46324806 Merge pull request #2475 from sgiraudot/Fix_counting_iterator_warning_everywhere-GF
Fix counting iterator warnings
2017-10-11 19:15:15 +02:00
Laurent Rineau 2b35bddfb2 Replace all std::binary_function by CGAL::binary_function 2017-10-04 16:36:32 +02:00
Simon Giraudot 1e7b9ea027 Fix counting iterator warnings 2017-09-29 14:47:17 +02:00
Mael Rouxel-Labbé 7e46e5c248 Fixed (?) uninitialized TVb_2 member 2017-08-29 11:22:28 +02:00
Mael Rouxel-Labbé aaeaf35380 Introduced the tag "Periodic_tag" to mark distinguish periodic triangulations 2017-08-23 16:18:05 +02:00
Mael Rouxel-Labbé d4d55453d7 Added a point() function to Triangulation_2
Necessary for Alpha_shapes_2 because some triangulations (e.g. P2T2) cannot
use v->point() but must use tr.point(v)
2017-08-23 11:00:50 +02:00
Sébastien Loriot 3131426c07 fix circumcenter in regular case 2017-08-01 21:30:59 +02:00
Laurent Rineau fc8aacc017 Fix compilation errors with non-MSVC compilers 2017-07-18 16:46:38 +02:00
Andreas Fabri 8463b1a251 Add implementation and test of Constrained_edges_iterator 2017-07-18 13:44:21 +02:00
Laurent Rineau 78f1988747 Merge pull request #2247 from lrineau/Surface_mesher-cleanup_after_Weighted_point_3-lrineau
Surface mesher: cleanup files after the move to Weighted_point_3
2017-07-17 12:24:03 +02:00
Laurent Rineau bad0922002 Re-introduce the deprecation warning for <CGAL/Weighted_point.h> 2017-07-12 10:19:59 +02:00
Laurent Rineau d5ada527ec Revert "Change comment to avoid warning"
This reverts commit 424c01285d.
2017-07-11 13:32:03 +02:00
Mael Rouxel-Labbé 71733cc689 Removed boost's function_property_map header includes
(that were re-added by auto merges again...)
2017-07-05 11:52:53 +02:00
Mael Rouxel-Labbé 5ef4ed6083 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
Based on master
2017-07-03 16:12:14 +02:00
Laurent Rineau d40fea257d Merge pull request #2198 from sloriot/T2-add_missing_include
add missing include directive to use CGAL::to_double()

(Via a merge of 'cgal/releases/CGAL-4.9-branch')
2017-06-28 10:52:12 +02:00
Mael Rouxel-Labbé 7bfd48d56d Minor include fix 2017-06-28 10:17:14 +02:00
Mael Rouxel-Labbé 8c7bda5f2d Changed from boost::function_property_map to CGAL::internal::boost_'s
This is so it's always available, even if using an old version of boost
2017-06-28 10:17:14 +02:00
Mael Rouxel-Labbé ddfc4fc0fe T2/T3 now use Perturbation_order in tests with symbolic perturbations 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 1fc2282350 Fixed regular triangulation capitalization across CGAL 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é d770640506 Fixed wrong template type (which induced taking references of references) 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé ec7efb6d70 Fixed Has_nested_type_Bare_point includes 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 9fbf2720ce Annihilated Regular_triangulation_euclidean_traits_23 across all packages
Left a little bit alive in the tests and in the Triangulation_23/doc
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé ff4888fb33 Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 1ccf2f5fee Fixed point type in the line face circulator 2 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 13af4ebb1f Changed some output from french to english 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 688b495d6f Fixed Triangulation_2's spatial_sorts on weighted points 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 1e2057f982 Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d97da922f8 Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 2451c122d1 Removed useless class Regular_traits_adaptor_2.h 2017-06-28 10:14:35 +02:00