Commit Graph

1540 Commits

Author SHA1 Message Date
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 f1c6990a57 Add a test for a reported issue 2019-04-18 13:52:34 +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
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +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 100d4f34ef Merge branch 'Triangulation_2-internal-GF-old' into Triangulation_2-internal-GF 2019-04-09 15:20:59 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Andreas Fabri a1609350aa Remove #include<CGAL/basic.h> amd put what is needed if something is missing 2019-03-27 15:21:33 +01:00
Laurent Rineau 1014687627
Merge pull request #3775 from MaelRL/Doc_fixes-GF
Doc fixes
2019-03-25 12:24:49 +01: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 60478dd816 Merge pull request #3758 from albert-github/feature/bug_advanced_2
Correction of (X)HTML warnings in case of Advanced topics
2019-03-19 18:30:53 +01:00
Mael Rouxel-Labbé 61b0be45eb Fix some bad links 2019-03-15 21:14:17 +01:00
albert-github 28fdb2d425 Correction of (X)HTML warnings in case of Advanced topics
Based on suggestion of @sloriot using `^^` also in cgalAdvancedEnd instead of adding a new line in the files
2019-03-15 11:33:48 +01:00
Maxime Gimeno d9f9c58342 Merge pull request #3729 from afabri/T2-typos-GF
T2,T3,Mesh_2: backticks, lowercase, capitalize
2019-03-12 17:04:17 +01:00
albert-github 8b7f0bcb1e Correction of (X)HTML warnings in case of Advanced topics
Based on #3713 a  number of problems were solved, but also some new issues introduced.
- BaseDoxyfile.h see to it that the CGALAdvancedBegin is in a detailed part, so be sure to terminate the brief part by an extra carriage return
- commands like \pre, \note read till the beginning of the next section but a \htmlonly is not seen as a section separator, so insert an extra carriage return
- some places  missed an "Advanced" indicator, used the cgalAdvancedType here.

##Note
in Periodic_2_triangulation_2.h there appear to be a number of images that are a bit in thin air (Captions: "Insertion of a point on an edge." and "Insertion in a face."). Also just above these images theer are a number of functions that have documentation, but this is non-doxygen documentation and as such not seen by doxygen
2019-03-10 16:00:52 +01:00
Laurent Rineau f5836b2206 Merge branch 'releases/CGAL-4.13-branch' 2019-03-07 14:31:16 +01:00
Laurent Rineau 99fe1bc548 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-07 14:26:47 +01:00
Sébastien Loriot 3887a21429 add missing text for brief of advanced class/type/function/concept 2019-03-05 08:01:17 +01:00
Andreas Fabri 6f836b5827 T2,T3,Mesh_2: backticks, lowercase, capitalize 2019-03-04 11:03:44 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Maxime Gimeno 6f294c8d09 Documents precondition 2019-02-19 13:29:10 +01:00
Andreas Fabri 427deceb9e Do not #define short names in the T2 testsuite 2019-02-14 12:51:52 +01:00
Andreas Fabri 25819705f5 Polyhedron, Intersections, PSP 2019-02-14 11:06:13 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 42b9a0be04 fix level 2019-02-14 10:26:05 +01:00
Andreas Fabri 7a84f58c0d T2, Spatial_searching, Ridges, Stream_lines 2019-02-14 10:15:50 +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é 1e27cfba44 Add layers.xy data file for T2 tests 2019-01-11 14:38:35 +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 0ef8b84b00 Remove Weighted_point doc 2019-01-11 13:47:18 +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é 04f3ad63fa Added some sanity tests for the T2 find_conflict functions 2019-01-11 12:33:16 +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
Laurent Rineau 8121e872ab Merge pull request #3513 from sloriot/CGAL-fix_maybe_uninit_vars_wrngs_2
Fix some wmaybe-uninitialized warnings
2018-12-19 16:08:55 +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
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Sébastien Loriot 54381db68a fix -Wmaybe-uninitialized warnings 2018-11-12 19:27:53 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name
Update the name of package names reference links
2018-10-29 10:27:53 +01:00
Laurent Rineau 73dd93c4e1 Merge pull request #3405 from gdamiand/CGAL_basic_viewers-bugfix-gdamiand
Basic viewers: bugfix for Epeck
2018-10-29 10:27:37 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Laurent Rineau a7c5c92f2f Check for CMakeLists.txt also in demos 2018-10-16 12:42:49 +02:00
Guillaume Damiand b45cf04fbf Align typedef 2018-10-15 14:20:30 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +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
Sébastien Loriot da0ca06329 walk used is the stochastic walk and not the line walk in locate 2018-09-03 15:36:26 +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
Sébastien Loriot d05df530b3 Merge pull request #2658 from MaelRL/Periodic_3_mesh_3-Feature-MBogdanov
Periodic_3_mesh_3, new package
2018-07-25 18:55:12 +02:00
Laurent Rineau 908311e903 Merge branch 'releases/CGAL-4.11-branch' into releases/CGAL-4.12-branch 2018-07-20 17:34:47 +02:00
Laurent Rineau 540a181b5e Merge pull request #3232 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points (cont.)
2018-07-20 17:32:52 +02:00
Laurent Rineau 0585ffcc39 Merge pull request #3232 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points (cont.)
2018-07-20 17:20:16 +02:00
Laurent Rineau 29f1f5147d add a test for bug #2999 2018-07-13 17:15:23 +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
Maxime Gimeno fdf94c8ee5 Upgrade minimum cmake version in examples to silent cmake warnings 2018-06-13 10:55:41 +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
Laurent Rineau e33030b3a9 Add dependencies to GraphicsView 2018-06-11 15:54:56 +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
Laurent Rineau 67558309bd Merge pull request #3098 from lrineau/Triangulation_2-Debug_CDT2-lrineau
Fix CDT_2 errors, using snapping of intersection points
2018-06-01 17:16:20 +02:00
Andreas Fabri 469b90456a Fix doc 2018-05-30 14:34:34 +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 8a0dc2f279 Add one draw example in each user manual. 2018-05-29 11:11:49 +02:00
Guillaume Damiand fb95a8e0d9 Add doc for draw 2018-05-29 11:11:49 +02:00
Guillaume Damiand 23426e70c4 Remove macro modified. 2018-05-29 11:11:49 +02:00
Guillaume Damiand ff586425af All 4 new examples to illustrate the usage of CGAL::draw. 2018-05-29 11:11:49 +02:00
Guillaume Damiand ddfb8204dc Add figures for all the basic viewers. 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 5edf2cd928 Add one viewer call for T2 2018-05-29 11:02:00 +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
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Laurent Rineau 3c70f8bad0 Fix dependencies by moving files 2018-03-23 14:17:24 +01:00
Mael Rouxel-Labbé 8646350d47 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-03-15 14:42:21 +01:00
Laurent Rineau ed0976600b Fix dependencies 2018-03-09 10:03:58 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Mael Rouxel-Labbé d9168d011c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 18:24:39 +01:00
Mael Rouxel-Labbé c28e05be0c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 12:50:06 +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
Laurent Rineau 11cf67905c Merge pull request #2824 from afabri/patch-2
Triangulation_2: fix a warning in  test/.../_test_line_face_circulator.h
2018-02-19 14:26:48 +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
Andreas Fabri e20672ea77
Update _test_line_face_circulator.h 2018-02-13 12:13:06 +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
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +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
Mael Rouxel-Labbé 0bca01d872 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-19 17:22:03 +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
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01: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
Mael Rouxel-Labbé 1f0de91fe2 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-02 15:19:38 +01:00
Giles Bathgate bfda956417
Correction to spelling Constaints -> Constraints 2017-10-30 08:59:04 +00:00
Mael Rouxel-Labbé 1f4475d471 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-10-27 16:26:27 +02:00
Mael Rouxel-Labbé f058555fc3 Minor doc changes in T2/T3 2017-10-25 14:31:54 +02:00
Laurent Rineau bf8c3701b3 Be careful with parallel test that reuse same files 2017-10-20 11:47:41 +02: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
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +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 d064199f30 Fix a warning 2017-07-18 16:46:56 +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é 2528541252 Minor doc improvements to T2 documentation 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é a64fb2f271 Cleaned Weighted_point_mappers from the documentation 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é d10ae41efd Added result_types to triangulation 2 test traits 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 9bfe9b24a5 Trimmed Construct_point_23's note in TriangulationTraits_23 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 31dc2998a5 Clarified some documentation about the usage of Construct_point_23 in TTraits_23 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é 52e366ebd3 TriangulationTraits_23 refine SpatialSortingTraits_23 for Hilbert sorting 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé f9b65eeac0 Small improvements to the (Regular)TriangulationTraits_2/3 concepts 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 42506237b2 Add Construct_point_2/3 to the concepts of triangulation traits
-- TriangulationTraits_2 requires Point_2 construct_point_2(Point_2)
-- RegularTriangulationTraits_2 requires Point_2 construct_point_2(Weighted_point_2)
-- TriangulationTraits_3 requires Point_3 construct_point_3(Point_3)
-- RegularTriangulationTraits_3 requires Point_3 construct_point_3(Weighted_point_3)
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 671e7bfda5 Triangulation_2 test traits must define Construct_point_2 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
Mael Rouxel-Labbé e421fe92f9 Fixed Regular_traits_adaptor
The functor members cannot be references because the Regular_triangulation
might be templated by a traits class that is not simply a Kernel (that is
the case in the package Interpolation).

When that is the case, calling this->K::function_object() might be a call
to a constructor in the base traits class. Thus, the functor members
of Reg_traits_adaptors get initialized to temporaries, which is problematic
because these temporaries are at a much lower scope and thus are quickly
cleaned, leaving us with references to nothing in Reg_traits_adaptor.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 860886dfc2 Improved readiblity of Regular_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 5f37a4bea6 Improved readability of Triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 2dc4974871 Improved readability of Delaunay_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 1091661007 Do not provide Bare_point overloads in Regular_triangulation_2
Additional:
-- Simplify the hierarchy_2: there is no need to distinguish between
   Bare_point and Weighted_point, that is the point (!) of the type "Point"
   in Triangulation_2.
-- Use Weighted_point in tests
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e96f05f31b Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé e08b054aff Trimmed Regular triangulation euclidean traits (doc version)
Now that the traits is exactly the kernel, there isn't a big need for a lot of
documentation.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé d2abb2d981 Trimmed Regular triangulation euclidean traits
-- Code added as consequence of disabling implicit conversion between points and
   weighted points implies that defining
     typedef weighted_point point;
   creates ambiguous functors.

   This typedef is nevertheless still used, in Weighted_point_mappers.

-- The traits are not supposed to define Bare_point
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé 22bd3538a0 Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-06-28 10:14:35 +02:00
Sébastien Loriot f0ec03218d using type from the base class 2017-06-28 10:14:35 +02:00
Sébastien Loriot e602bae784 version without partial specialization
the norms says that partial specialization should be
done in a namespace (not inside a class)
2017-06-28 10:14:35 +02:00
Andreas Fabri 83b0d24df8 make it work for the triangulation hierarchy with regular 2017-06-28 10:14:35 +02:00
Andreas Fabri d73be575f5 Do in 2D what we did in 3D 2017-06-28 10:14:35 +02:00
Laurent Rineau 028213df6e Merge pull request #2198 from sloriot/T2-add_missing_include
add missing include directive to use CGAL::to_double()
2017-06-27 16:29:35 +02:00
Sébastien Loriot 1fc06e0550 add missing include directive to use CGAL::to_double() 2017-06-26 07:06:20 +02:00
Clement Jamin c7bd6a7403 Include licence check header 2017-06-23 10:41:05 +02:00
Clement Jamin 5b9562ea84 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2017-06-16 11:09:07 +02:00
Mael Rouxel-Labbé 3c42724e22 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
Based on Kernel_Weighted_point_without...
  @ 41e7520b3e
2017-06-15 15:07:53 +02:00