Commit Graph

1347 Commits

Author SHA1 Message Date
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
Mael Rouxel-Labbé 98800d2de8 Fixed regular triangulation capitalization across CGAL 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé fcfc3446e8 Minor doc improvements to T2 documentation 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é 30efb5deb6 Cleaned Weighted_point_mappers from the documentation 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é 5aea22e40b Added result_types to triangulation 2 test traits 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 1d6fb4764b Trimmed Construct_point_23's note in TriangulationTraits_23 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 4003f28fcb Clarified some documentation about the usage of Construct_point_23 in TTraits_23 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é 93d16a4d23 TriangulationTraits_23 refine SpatialSortingTraits_23 for Hilbert sorting 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé e44fe83070 Small improvements to the (Regular)TriangulationTraits_2/3 concepts 2017-06-15 10:34:15 +02:00
Mael Rouxel-Labbé 1f34ef2b2d 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-15 10:34:15 +02:00
Mael Rouxel-Labbé 6e89b7fb63 Triangulation_2 test traits must define Construct_point_2 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é d6efc61ddd 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-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é a3e66e1ad7 Minor doc improvements to T2 documentation 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 5f1ba08d52 Fixed minor mistakes from a rebase 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 50c5385015 Cleaned Weighted_point_mappers from the documentation 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é 9b51a472f6 Added result_types to triangulation 2 test traits 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 84c830d25f Trimmed Construct_point_23's note in TriangulationTraits_23 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé f2ec162b4f Clarified some documentation about the usage of Construct_point_23 in TTraits_23 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é 245a9549cb TriangulationTraits_23 refine SpatialSortingTraits_23 for Hilbert sorting 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé f14c0c7479 Small improvements to the (Regular)TriangulationTraits_2/3 concepts 2017-06-08 13:23:10 +02:00
Mael Rouxel-Labbé 2640fb4d06 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-08 13:23:10 +02:00
Mael Rouxel-Labbé 18e854e95f Triangulation_2 test traits must define Construct_point_2 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é ed4ca2ee69 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-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é 7b1041a3d8 Minor doc improvements to T2 documentation 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé b65bfb3a4e Fixed minor mistakes from a rebase 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 09e319219d Cleaned Weighted_point_mappers from the documentation 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é 4e9fd5e89e Added result_types to triangulation 2 test traits 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 550920dc80 Trimmed Construct_point_23's note in TriangulationTraits_23 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 29b6f370a3 Clarified some documentation about the usage of Construct_point_23 in TTraits_23 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é 54bae5140a TriangulationTraits_23 refine SpatialSortingTraits_23 for Hilbert sorting 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé fb36babdea Small improvements to the (Regular)TriangulationTraits_2/3 concepts 2017-05-22 11:27:02 +02:00
Mael Rouxel-Labbé 0e5d279f42 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-05-22 11:27:02 +02:00
Mael Rouxel-Labbé a9c9e17eab Triangulation_2 test traits must define Construct_point_2 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é 72be6f32d2 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-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é 63a3adb8d5 Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle 2017-05-18 10:40:11 +02:00
Mael Rouxel-Labbé c0d5b24466 Cleaned Weighted_point_mappers from the documentation 2017-05-17 16:40:04 +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é 8688a529c4 Added result_types to triangulation 2 test traits 2017-05-12 12:18:37 +02:00
Mael Rouxel-Labbé 1d93d4d89e Trimmed Construct_point_23's note in TriangulationTraits_23 2017-05-10 17:39:47 +02:00
Mael Rouxel-Labbé 82878dccfe Clarified some documentation about the usage of Construct_point_23 in TTraits_23 2017-05-10 12:37:20 +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
Laurent Rineau cbd73f4274 Merge pull request #2046 from MaelRL/Kernel-Fix_weighted_point-GF
Improve the implementation of weighted_point_23
2017-05-09 12:14:23 +02:00
Laurent Rineau c754fc70d2 Merge pull request #2046 from MaelRL/Kernel-Fix_weighted_point-GF
Improve the implementation of weighted_point_23
2017-05-09 12:08:05 +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é 4857cad651 TriangulationTraits_23 refine SpatialSortingTraits_23 for Hilbert sorting 2017-05-03 18:53:23 +02:00
Mael Rouxel-Labbé 9fda4a395a Small improvements to the (Regular)TriangulationTraits_2/3 concepts 2017-05-02 17:28:11 +02:00
Mael Rouxel-Labbé b04ac5a0df 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-05-02 17:26:31 +02:00
Mael Rouxel-Labbé 628233ff21 Triangulation_2 test traits must define Construct_point_2 2017-05-01 16:23:59 +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é f67d75e0df 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-04-14 15:53:12 +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
Mael Rouxel-Labbé ef17853876 Minor documenation fixes 2017-04-07 03:46:05 +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
Andreas Fabri de805a8934 Change the template parameter name as VC++ has a problem when combining the hierarchy with CDT_plus_2 2017-03-23 15:18:53 +01:00
Andreas Fabri 3f0040ef63 Add types and property maps so that the triangulations become a model of FaceGraph 2017-03-23 14:26:51 +01:00
Andreas Fabri ba148d1dd8 Add types and property maps so that the triangulations become a model of FaceGraph 2017-03-23 12:51:04 +01:00
Andreas Fabri 23814e692f Remove functions that already exist for the base class. Add graph_traits for the constrained triangulations 2017-03-23 11:58:46 +01:00
Sébastien Loriot 1e4bba379b using type from the base class 2017-03-06 12:11:09 +01:00
Sébastien Loriot ac0dfe3465 version without partial specialization
the norms says that partial specialization should be
done in a namespace (not inside a class)
2017-03-06 12:10:24 +01:00
Andreas Fabri 9dd7b63e2a make it work for the triangulation hierarchy with regular 2017-03-03 16:25:09 +01:00
Andreas Fabri f6cf296d5f Do in 2D what we did in 3D 2017-03-03 15:32:24 +01:00
Laurent Rineau 1a2f617d89 Merge pull request #1843 from afabri/BGL_accelerate_copy_face_graph-GF
Accelerate copy_face_graph
2017-02-08 17:32:47 +01:00
Sébastien Loriot 0270ec473a Merge pull request #1255 from afabri/CGAL-license_check-GF
Add a license check mechanism
2017-01-25 17:14:55 +01:00
Andreas Fabri 9dbfffc996 Triangulation_2: Add an example that combines Projection_traits and vertex_with_info 2017-01-23 09:18:39 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Sébastien Loriot e50ae3c7bf fix copy-paste bug 2017-01-18 15:29:35 +01:00
Sébastien Loriot 9ae7b37845 Merge pull request #1745 from sloriot/Polyhedra_corefinement-enhancements-sloriot
Add corefinement operations in PMP
2017-01-12 12:05:18 +01:00
Sébastien Loriot 99234880c9 Merge pull request #1786 from afabri/Triangulation_2-Prevent_deref-GF
Triangulation_2: Reduce code by switching to Prevent_deref
2017-01-02 19:10:24 +01:00
Sébastien Loriot fe5e925367 Merge pull request #1701 from afabri/Convex_hull_3-FaceGraph-GF
Convex_hull_3: Switch to FaceGraph
2016-12-30 15:14:34 +01:00
Andreas Fabri a2a3daed85 capitalize 2016-12-30 10:48:16 +01:00
Andreas Fabri 9fd4e03a0d Use Prevent_deref 2016-12-29 14:06:04 +01:00
Andreas Fabri b4d1f8f0f7 Use Prevent_deref 2016-12-29 13:17:38 +01:00
Andreas Fabri b867150561 Use Prevent_deref 2016-12-29 13:12:00 +01:00
Laurent Rineau bbf430b0b1 Merge pull request #585 from afabri/Kernel-Weighted_point-GF
Introduce Kernel::Weighted_point_3 together with functors
2016-12-20 19:52:02 +01:00
Sébastien Loriot 15b7f052da remove an extra const
follow-up of dbafcaa0
2016-12-15 17:30:53 +01:00
Andreas Fabri 0b1ee33a60 Introduce and use a new filtered predicate class for predicates having states
The exact predicate is constructed only when needed. In particular, the exact
version of the state is also constructed only when needed.

The constness of data members of predicates of Triangulation_2_filtered_traits
has been removed to allor operator= to be defined (and used by optional)
2016-12-14 11:25:06 +01:00
Jane Tournois 847a76d22b add missing 'L' 2016-12-09 12:45:29 +01:00
Andreas Fabri 6d13fa2c31 Fixes afer Monique's review 2016-12-09 10:17:23 +01:00
Andreas Fabri a2b7c569b6 Do not use Regular_triangulation_euclidean_traits_2 in examples 2016-12-08 12:49:33 +01:00
Andreas Fabri b0cd40a6b2 Do not use Regular_triangulation_euclidean_traits_2 in examples 2016-12-08 12:47:46 +01:00
Andreas Fabri 1dfc9c631d Document Regular_triangulation_vertex_base_3 as well as the concept and use it in examples instead of Regular_triangulation_euclidean_traits 2016-12-08 12:39:26 +01:00
Laurent Rineau b354b24270 Merge pull request #1712 from sloriot/CGAL-add_missing_include
add missing include directive
2016-12-02 11:37:08 +01:00
Sébastien Loriot 5b61aa18a8 workaroung a bug in g++ 4.4 2016-11-30 08:49:19 +01:00
Guillaume Damiand 2ab268965f LCC for CMap and GMap; incremental builder; save and load; test. 2016-11-29 11:43:36 +01:00
Sébastien Loriot 728bc98d37 add missing include directive 2016-11-22 16:23:22 +01:00
Andreas Fabri fbebd1c531 Add doc of Weighted_point_mapper_2 2016-11-21 17:17:05 +01:00
Andreas Fabri d624271315 Remove usage of Regular_triangulation_euclidean_traits_3 2016-11-21 16:43:40 +01:00
Laurent Rineau 2835e361c8 Fix the constructors of RT euclidian traits class
@janetournois @afabri

That commit will fix both runtime errors in Interpolation and
compilation errors in KDS:

  - in Interpolation, the traits class carries a normal vector: it needs
  to be passed to the RT traits class as well,

  - Same in KDS: the compilation error was saying that the constructor
    of RT_euclidian_traits_3 must initialize it base class.
2016-11-18 17:55:05 +01:00
Andreas Fabri 8b8c52cf7f fix typos in the doc
Add boost::graph_traits for a TDS_2
2016-11-18 09:41:40 +01:00
Andreas Fabri c37b7b04fe remove doc of Weighted_point_mappper_2 2016-11-16 10:40:59 +01:00
Andreas Fabri 490949efa7 fix Interpolation package 2016-11-16 09:58:23 +01:00
Andreas Fabri e87351e51a A typname too much 2016-11-16 08:20:44 +01:00
Jane Tournois 0f569a8fd6 introduce Has_nested_type_Bare_point to keep backward compatible
it is needed when Regular_triangulation_euclidean_traits is used the first
template parameter for Regular_triangulation (both 2d and 3d)
2016-11-03 14:57:10 +01:00
Jane Tournois 2c9a580c96 all CGAL kernels are now models of `RegularTriangulationTraits_2`
wrapper Weighted_point_mapper_2 is not necessary anymore
2016-11-03 14:55:39 +01:00