songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No need for a Weighted_converter

This commit is contained in:
Andreas Fabri 2015-12-21 22:36:54 +01:00 committed by Jane Tournois
parent 841ecfe8f4
commit 9eca152dca
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Kernel_23/include/CGAL/Point_3.h
View File

@ -50,6 +50,7 @@ public:
typedef Dimension_tag<3> Ambient_dimension;
typedef Dimension_tag<0> Feature_dimension;
typedef typename R_::Weighted_point_3 Weighted_point_3;
typedef typename R_::Kernel_base::Point_3 Rep;
typedef typename R_::Cartesian_const_iterator_3 Cartesian_const_iterator;
@ -74,6 +75,10 @@ public:
Point_3(const Rep& p)
: Rep(p) {}
Point_3(const Weighted_point_3& wp)
: Rep(wp.point())
{}
template < typename T1, typename T2, typename T3 >
Point_3(const T1& x, const T2& y, const T3& z)
: Rep(typename R::Construct_point_3()(Return_base_tag(), x, y, z))

6
Mesh_3/include/CGAL/Mesh_3/Creator_weighted_point_3.h
View File

@ -56,8 +56,10 @@ public:
/// We do not pass \c const \c Arg_& because \c Arg_ is a ring number type
Weighted_point operator()(Arg_ a1, Arg_ a2, Arg_ a3) const
{
typedef typename Weighted_point::Point Bare_point;
return Weighted_point(Bare_point(a1,a2,a3));
// AF: check this
//typedef typename Weighted_point::Point Bare_point;
// return Weighted_point(Bare_point(a1,a2,a3));
return Weighted_point(a1,a2,a3);
}
private:

12
Mesh_3/include/CGAL/Mesh_3/Robust_weighted_circumcenter_filtered_traits_3.h
View File

@ -42,8 +42,8 @@ class Robust_filtered_compute_squared_radius_3
{
public:
typedef Exact_predicates_exact_constructions_kernel EK;
typedef Weighted_converter_3<Cartesian_converter<K, EK> > To_exact;
typedef Weighted_converter_3<Cartesian_converter<EK,K> > Back_from_exact;
typedef Cartesian_converter<K, EK> To_exact;
typedef Cartesian_converter<EK,K> Back_from_exact;
typedef typename K::Point_3 Point_3;
typedef typename K::FT FT;
@ -149,8 +149,8 @@ class Robust_filtered_construct_weighted_circumcenter_3
{
public:
typedef Exact_predicates_exact_constructions_kernel EK;
typedef Weighted_converter_3<Cartesian_converter<K_, EK> > To_exact;
typedef Weighted_converter_3<Cartesian_converter<EK,K_> > Back_from_exact;
typedef Cartesian_converter<K_, EK> To_exact;
typedef Cartesian_converter<EK,K_> Back_from_exact;
typedef CGAL::Regular_triangulation_euclidean_traits_3<K_> Rt;
typedef CGAL::Regular_triangulation_euclidean_traits_3<EK> Exact_Rt;
@ -289,8 +289,8 @@ class Robust_filtered_compute_squared_radius_smallest_orthogonal_sphere_3
{
public:
typedef Exact_predicates_exact_constructions_kernel EK;
typedef Weighted_converter_3<Cartesian_converter<K_, EK> > To_exact;
typedef Weighted_converter_3<Cartesian_converter<EK,K_> > Back_from_exact;
typedef Cartesian_converter<K_, EK> To_exact;
typedef Cartesian_converter<EK,K_> Back_from_exact;
typedef CGAL::Regular_triangulation_euclidean_traits_3<K_> Rt;
typedef CGAL::Regular_triangulation_euclidean_traits_3<EK> Exact_Rt;