Mael Rouxel-Labbé
5018c014b7
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é
1f8b6d3e19
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é
a0fe29116b
Fixed bad merge and removed the last include of Reg_tr_euclidean_traits_2
2017-05-24 14:08:23 +02:00