Commit Graph

909 Commits

Author SHA1 Message Date
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
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é 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
Mael Rouxel-Labbé 98800d2de8 Fixed regular triangulation capitalization across CGAL 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 8fbe17c080 Fixed minor mistakes from a rebase 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 9872edfe93 Fixed wrong template type (which induced taking references of references) 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 8ad34307ad Fixed Has_nested_type_Bare_point includes 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 451f084021 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-15 10:34:15 +02:00
Mael Rouxel-Labbé d26954a341 Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé c210c4d9b8 Fixed point type in the line face circulator 2 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé f2eeffcc15 Changed some output from french to english 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 357ca0bc1b Fixed Triangulation_2's spatial_sorts on weighted points 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé c1a6bf0849 Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé a97db4fe62 Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 09d4a3e8dc Removed useless class Regular_traits_adaptor_2.h 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 1e5ad8c41e 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-15 10:34:15 +02:00
Mael Rouxel-Labbé 840619c39c Improved readiblity of Regular_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé 74cf687dd2 Improved readability of Triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé eb87c95956 Improved readability of Delaunay_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé ccf1385adf 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-15 10:32:03 +02:00
Mael Rouxel-Labbé 89d095d683 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-06-15 10:32:03 +02:00
Mael Rouxel-Labbé 12a39cb727 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-15 10:32:03 +02:00
Mael Rouxel-Labbé a0153d77ce Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-06-15 10:32:03 +02:00
Sébastien Loriot 5a3fe64d71 using type from the base class 2017-06-15 10:32:03 +02:00
Sébastien Loriot 8b49402d80 version without partial specialization
the norms says that partial specialization should be
done in a namespace (not inside a class)
2017-06-15 10:32:03 +02:00
Andreas Fabri 2b2de1bf22 make it work for the triangulation hierarchy with regular 2017-06-15 10:29:26 +02:00
Andreas Fabri 21395c7d5e Do in 2D what we did in 3D 2017-06-15 10:29:26 +02:00
Mael Rouxel-Labbé 5955f9c7c0 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
Based on Kernel_Weighted_point_without...
  @ 67c531af53
2017-06-08 14:37:26 +02:00
Mael Rouxel-Labbé 5f1ba08d52 Fixed minor mistakes from a rebase 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 42469ac33a Fixed wrong template type (which induced taking references of references) 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé e861cc0f61 Fixed Has_nested_type_Bare_point includes 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé a2f5f64fc3 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-08 13:23:10 +02:00
Mael Rouxel-Labbé f54ec34d1a Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé be154515fc Fixed point type in the line face circulator 2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 0181e353dd Changed some output from french to english 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé a45325a20e Fixed Triangulation_2's spatial_sorts on weighted points 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 50670b1303 Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 3a48794d5c Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé a54d9c9148 Removed useless class Regular_traits_adaptor_2.h 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 759d8b3a30 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-08 13:23:10 +02:00
Mael Rouxel-Labbé 8274aec2e0 Improved readiblity of Regular_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé d277c44b7d Improved readability of Triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé eb837bfd39 Improved readability of Delaunay_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 5205d3c1f3 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-08 13:23:10 +02:00
Mael Rouxel-Labbé 4baa9531c1 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé ee5b2d2876 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-08 13:23:10 +02:00
Mael Rouxel-Labbé f5d617f50c Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-06-08 13:23:10 +02:00
Sébastien Loriot 4037d48fca using type from the base class 2017-06-08 13:23:10 +02:00
Sébastien Loriot f783413de9 version without partial specialization
the norms says that partial specialization should be
done in a namespace (not inside a class)
2017-06-08 13:23:10 +02:00
Andreas Fabri 92bf9ffe2c make it work for the triangulation hierarchy with regular 2017-06-08 13:23:10 +02:00
Andreas Fabri 858e846b72 Do in 2D what we did in 3D 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 9b5f5be821 Fixed bad merge and removed the last include of Reg_tr_euclidean_traits_2 2017-05-24 14:08:23 +02:00
Mael Rouxel-Labbé 5354134469 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle 2017-05-24 12:18:49 +02:00
Mael Rouxel-Labbé b65bfb3a4e Fixed minor mistakes from a rebase 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 9debfdfd78 Fixed wrong template type (which induced taking references of references) 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 70e1ac97f6 Fixed Has_nested_type_Bare_point includes 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 22322e3c83 Annihilated Regular_triangulation_euclidean_traits_23 across all packages
Left a little bit alive in the tests and in the Triangulation_23/doc
2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 1526241f91 Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé a147bdfc13 Fixed point type in the line face circulator 2 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé c4277cca60 Changed some output from french to english 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé f55f6e2db9 Fixed Triangulation_2's spatial_sorts on weighted points 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé acc94726ec Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé a575f5a875 Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé fb363681b7 Removed useless class Regular_traits_adaptor_2.h 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 84d7f97975 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-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 1242ea4c00 Improved readiblity of Regular_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé 0a556f9039 Improved readability of Triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé d5d6383842 Improved readability of Delaunay_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé 4fba43fa35 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-05-22 11:20:45 +02:00
Mael Rouxel-Labbé ef262c9d24 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé e041870954 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-05-22 11:20:45 +02:00
Mael Rouxel-Labbé 4f81c8c794 Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-05-22 11:20:45 +02:00
Sébastien Loriot 09f0be4418 using type from the base class 2017-05-22 11:20:45 +02:00
Sébastien Loriot 51bc69cca3 version without partial specialization
the norms says that partial specialization should be
done in a namespace (not inside a class)
2017-05-22 11:20:45 +02:00
Andreas Fabri 556d73819d make it work for the triangulation hierarchy with regular 2017-05-22 11:20:45 +02:00
Andreas Fabri b621a425b5 Do in 2D what we did in 3D 2017-05-22 11:20:45 +02:00
Mael Rouxel-Labbé f45c008721 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
Using afabri/Kernel_Weighted_point_without_conversion-GF
  @ 5c2a089e3e
2017-05-16 17:48:07 +02:00
Laurent Rineau 0feb23ec43 Re-add <CGAL/config.h> to avoid a conflict with `master`
The `#include` was removed by error by:

    73122ac202
    Author: Andreas Fabri <andreas.fabri@geometryfactory.com>
    Date:   Tue May 16 08:26:08 2017 +0200

        Change comment to avoid warning
2017-05-16 10:53:44 +02:00
Mael Rouxel-Labbé 424c01285d Change comment to avoid warning 2017-05-16 10:19:54 +02:00
Andreas Fabri 73122ac202 Change comment to avoid warning 2017-05-16 10:19:54 +02:00
Mael Rouxel-Labbé 0cd98e6ff1 Silenced depreciation warnings from Weighted_point.h 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé 266775bafa Silenced depreciation warnings from Regular_triangulation_euclidean_traits_23 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé cd2a562ffa Fixed improper guards against the inclusion of deprecated headers 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé c353f0f49c Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-05-16 10:17:41 +02:00
Mael Rouxel-Labbé d07976b2ac All triangulations now use Perturbation_order in tests using symbolic perturbations 2017-05-15 17:13:38 +02:00
Mael Rouxel-Labbé 9f865e87bb Fixed wrong template type (which induced taking references of references) 2017-05-12 12:21:39 +02:00
Mael Rouxel-Labbé 46b489b2b5 Fixed Has_nested_type_Bare_point includes 2017-05-10 12:33:43 +02:00
Mael Rouxel-Labbé 97b789a741 Merge branch 'Kernel_Weighted_point_without_conversion-GF-old' into Kernel_Weighted_point_without_conversion-GF 2017-05-10 12:32:46 +02:00
Mael Rouxel-Labbé a7cabb5369 Annihilated Regular_triangulation_euclidean_traits_23 across all packages
Left a little bit alive in the tests and in the Triangulation_23/doc
2017-05-05 12:56:18 +02:00
Mael Rouxel-Labbé 57199b822b Projection traits must define Construct_point_2 and Construct_weighted_point_2 2017-05-01 16:23:27 +02:00
Mael Rouxel-Labbé 869ab89553 Fixed point type in the line face circulator 2 2017-05-01 16:22:47 +02:00
Mael Rouxel-Labbé d7680ad54b Changed some output from french to english 2017-05-01 16:22:29 +02:00
Mael Rouxel-Labbé 6bbeee9186 Fixed Triangulation_2's spatial_sorts on weighted points 2017-05-01 16:21:34 +02:00
Mael Rouxel-Labbé 2a8d77882e Triangulation_2's point type is deduced from the TDS::Vb, not from the traits 2017-05-01 16:20:29 +02:00
Mael Rouxel-Labbé 206247744b Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2 2017-05-01 16:19:31 +02:00
Mael Rouxel-Labbé fbbd583b79 Removed useless class Regular_traits_adaptor_2.h 2017-05-01 16:17:55 +02:00
Mael Rouxel-Labbé ac63b66286 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-04-18 15:16:43 +02:00
Mael Rouxel-Labbé fa6b7b7048 Improved readiblity of Regular_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-04-15 20:29:33 +02:00
Mael Rouxel-Labbé ce44fd046b Improved readability of Triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-04-15 20:27:08 +02:00
Mael Rouxel-Labbé d9d54e287b Improved readability of Delaunay_triangulation_2.h (no real changes)
Only whitespace cleaning, indentation fixing, empty lines removal, etc.
2017-04-15 20:26:23 +02:00
Laurent Rineau a1cd3fd9d5 Merge pull request #1991 from afabri/Triangulation_2-graph_traits_for_CDT-GF
Triangulation_2: Add graph_traits for all triangulation classes
2017-04-14 18:32:14 +02:00
Mael Rouxel-Labbé e4fc874acd 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-04-14 16:54:24 +02:00
Mael Rouxel-Labbé 33fab40dc0 Fixed Bare_point / Weighted_point usage in Triangulation_2 2017-04-14 16:53:18 +02:00
Mael Rouxel-Labbé 3c9063cd88 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-04-14 15:39:30 +02:00
Mael Rouxel-Labbé 863584e863 Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits 2017-04-14 10:59:42 +02:00
Laurent Rineau 87c9afd486 Fix the compilation of individual headers
- in most cases, that was just adding missing #include
- I have removed the use of <CGAL/basic.h>
2017-04-13 15:56:51 +02:00
Mael Rouxel-Labbé 2ee5b13e6f Merge branch 'Kernel_Weighted_point_without_conversion-GF-old' into Kernel_Weighted_point_without_conversion-GF
Using Kernel-Fix_weighted_point-GF @ 8703f5c122
2017-04-11 17:01:25 +02:00
Andreas Fabri 8cbbe0e165 Remove dependencies of Triangulation_3 on Triangulation_2 2017-04-06 11:08:37 +02:00
Andreas Fabri e64884da90 Also add support for Regular_triangulation_2 2017-03-31 12:38:17 +02:00
Andreas Fabri 3c6741feba typename typename -> typename 2017-03-29 15:00:15 +02:00
Andreas Fabri a6d43f0a15 capitalize file name that gets included; fix typo 2017-03-24 08:44:18 +01:00
Andreas Fabri 08eacf9d02 forward the types from the template parameter 2017-03-23 15:20:57 +01:00