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
5f1ba08d52
Fixed minor mistakes from a rebase
2017-06-08 13:23:10 +02:00
42469ac33a
Fixed wrong template type (which induced taking references of references)
2017-06-08 13:23:10 +02:00
e861cc0f61
Fixed Has_nested_type_Bare_point includes
2017-06-08 13:23:10 +02:00
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
f54ec34d1a
Projection traits must define Construct_point_2 and Construct_weighted_point_2
2017-06-08 13:23:10 +02:00
be154515fc
Fixed point type in the line face circulator 2
2017-06-08 13:23:10 +02:00
0181e353dd
Changed some output from french to english
2017-06-08 13:23:10 +02:00
a45325a20e
Fixed Triangulation_2's spatial_sorts on weighted points
2017-06-08 13:23:10 +02:00
50670b1303
Triangulation_2's point type is deduced from the TDS::Vb, not from the traits
2017-06-08 13:23:10 +02:00
3a48794d5c
Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2
2017-06-08 13:23:10 +02:00
a54d9c9148
Removed useless class Regular_traits_adaptor_2.h
2017-06-08 13:23:10 +02:00
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
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
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
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
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
4baa9531c1
Fixed Bare_point / Weighted_point usage in Triangulation_2
2017-06-08 13:23:10 +02:00
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
f5d617f50c
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-06-08 13:23:10 +02:00
4037d48fca
using type from the base class
2017-06-08 13:23:10 +02:00
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
92bf9ffe2c
make it work for the triangulation hierarchy with regular
2017-06-08 13:23:10 +02:00
858e846b72
Do in 2D what we did in 3D
2017-06-08 13:23:10 +02:00
9b5f5be821
Fixed bad merge and removed the last include of Reg_tr_euclidean_traits_2
2017-05-24 14:08:23 +02:00
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
b65bfb3a4e
Fixed minor mistakes from a rebase
2017-05-22 11:27:02 +02:00
9debfdfd78
Fixed wrong template type (which induced taking references of references)
2017-05-22 11:27:02 +02:00
70e1ac97f6
Fixed Has_nested_type_Bare_point includes
2017-05-22 11:27:02 +02:00
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
1526241f91
Projection traits must define Construct_point_2 and Construct_weighted_point_2
2017-05-22 11:27:02 +02:00
a147bdfc13
Fixed point type in the line face circulator 2
2017-05-22 11:27:02 +02:00
c4277cca60
Changed some output from french to english
2017-05-22 11:27:02 +02:00
f55f6e2db9
Fixed Triangulation_2's spatial_sorts on weighted points
2017-05-22 11:27:02 +02:00
acc94726ec
Triangulation_2's point type is deduced from the TDS::Vb, not from the traits
2017-05-22 11:27:02 +02:00
a575f5a875
Removed obsolete Weighted_point_mapper trick for Regular_triangulation_2
2017-05-22 11:27:02 +02:00
fb363681b7
Removed useless class Regular_traits_adaptor_2.h
2017-05-22 11:27:02 +02:00
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
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
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
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
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
ef262c9d24
Fixed Bare_point / Weighted_point usage in Triangulation_2
2017-05-22 11:20:45 +02:00
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
4f81c8c794
Added CGAL_NO_DEPRECATED_CODE macros to Regular_triangulation_euclidean_traits
2017-05-22 11:20:45 +02:00
09f0be4418
using type from the base class
2017-05-22 11:20:45 +02:00
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
556d73819d
make it work for the triangulation hierarchy with regular
2017-05-22 11:20:45 +02:00
b621a425b5
Do in 2D what we did in 3D
2017-05-22 11:20:45 +02:00
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
Mael Rouxel-Labbé
Sébastien Loriot
Andreas Fabri