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

Ensured that we call kernel functions with the correct (bare) point type 

Note that if the type `Point` is already `Point_3`, Construct_point_3 does not
do anything (except in the lazy kernel, but in that case, the running time is
horrible anyway).
This commit is contained in:
Mael Rouxel-Labbé 2017-04-27 00:25:12 +02:00
parent 13d5e895ac
commit db5da73483
1 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -545,61 +545,78 @@ protected:
GT _gt; GT _gt;
Vertex_handle infinite; //infinite vertex Vertex_handle infinite; //infinite vertex
Point_3 construct_point(const Point &p) const
{
return geom_traits().construct_point_3_object()(p);
}
Comparison_result Comparison_result
compare_xyz(const Point &p, const Point &q) const compare_xyz(const Point &p, const Point &q) const
{ {
return geom_traits().compare_xyz_3_object()(p, q); return geom_traits().compare_xyz_3_object()(construct_point(p),
construct_point(q));
} }
bool bool
equal(const Point &p, const Point &q) const equal(const Point &p, const Point &q) const
{ {
return compare_xyz(p, q) == EQUAL; return compare_xyz(p, q) == EQUAL;
} }
Orientation Orientation
orientation(const Point &p, const Point &q, orientation(const Point &p, const Point &q,
const Point &r, const Point &s) const const Point &r, const Point &s) const
{ {
return geom_traits().orientation_3_object()(p, q, r, s); return geom_traits().orientation_3_object()(construct_point(p),
construct_point(q),
construct_point(r),
construct_point(s));
} }
bool bool
coplanar(const Point &p, const Point &q, coplanar(const Point &p, const Point &q,
const Point &r, const Point &s) const const Point &r, const Point &s) const
{ {
return orientation(p, q, r, s) == COPLANAR; return orientation(p, q, r, s) == COPLANAR;
} }
Orientation Orientation
coplanar_orientation(const Point &p, const Point &q, const Point &r) const coplanar_orientation(const Point &p, const Point &q, const Point &r) const
{ {
return geom_traits().coplanar_orientation_3_object()(p, q, r); return geom_traits().coplanar_orientation_3_object()(construct_point(p),
construct_point(q),
construct_point(r));
} }
bool bool
collinear(const Point &p, const Point &q, const Point &r) const collinear(const Point &p, const Point &q, const Point &r) const
{ {
return coplanar_orientation(p, q, r) == COLLINEAR; return coplanar_orientation(p, q, r) == COLLINEAR;
} }
Segment Segment
construct_segment(const Point &p, const Point &q) const construct_segment(const Point &p, const Point &q) const
{ {
return geom_traits().construct_segment_3_object()(p, q); return geom_traits().construct_segment_3_object()(construct_point(p),
construct_point(q));
} }
Triangle Triangle
construct_triangle(const Point &p, const Point &q, const Point &r) const construct_triangle(const Point &p, const Point &q, const Point &r) const
{ {
return geom_traits().construct_triangle_3_object()(p, q, r); return geom_traits().construct_triangle_3_object()(construct_point(p),
construct_point(q),
construct_point(r));
} }
Tetrahedron Tetrahedron
construct_tetrahedron(const Point &p, const Point &q, construct_tetrahedron(const Point &p, const Point &q,
const Point &r, const Point &s) const const Point &r, const Point &s) const
{ {
return geom_traits().construct_tetrahedron_3_object()(p, q, r, s); return geom_traits().construct_tetrahedron_3_object()(construct_point(p),
construct_point(q),
construct_point(r),
construct_point(s));
} }
enum COLLINEAR_POSITION {BEFORE, SOURCE, MIDDLE, TARGET, AFTER}; enum COLLINEAR_POSITION {BEFORE, SOURCE, MIDDLE, TARGET, AFTER};
@ -6528,6 +6545,12 @@ test_next(const Triangulation_3<GT, Tds1, Lds> &t1,
typedef typename std::map<Vertex_handle1, typedef typename std::map<Vertex_handle1,
Vertex_handle2>::const_iterator Vit; Vertex_handle2>::const_iterator Vit;
typedef typename Tr1::Geom_traits::Construct_point_3 Construct_point_3;
typedef typename Tr1::Geom_traits::Compare_xyz_3 Compare_xyz_3;
Compare_xyz_3 cmp1 = t1.geom_traits().compare_xyz_3_object();
Construct_point_3 cp = t1.geom_traits().construct_point_3_object();
std::vector<std::pair<Cell_handle1, Cell_handle2> > cell_stack; std::vector<std::pair<Cell_handle1, Cell_handle2> > cell_stack;
cell_stack.push_back(std::make_pair(c1, c2)); cell_stack.push_back(std::make_pair(c1, c2));
@ -6564,8 +6587,7 @@ test_next(const Triangulation_3<GT, Tds1, Lds> &t1,
if (t2.is_infinite(vn2)) if (t2.is_infinite(vn2))
return false; // vn1 can't be infinite, return false; // vn1 can't be infinite,
// since it would have been registered. // since it would have been registered.
if (t1.geom_traits().compare_xyz_3_object()(vn1->point(), if (cmp1(cp(vn1->point()), cp(vn2->point())) != 0)
vn2->point()) != 0)
return false; return false;
// We register vn1/vn2. // We register vn1/vn2.
Vmap.insert(std::make_pair(vn1, vn2)); Vmap.insert(std::make_pair(vn1, vn2));
@ -6594,12 +6616,16 @@ operator==(const Triangulation_3<GT, Tds1, Lds> &t1,
typedef typename Triangulation_3<GT, Tds2>::Cell_handle Cell_handle2; typedef typename Triangulation_3<GT, Tds2>::Cell_handle Cell_handle2;
typedef typename Triangulation_3<GT, Tds1>::Point Point; typedef typename Triangulation_3<GT, Tds1>::Point Point;
typedef typename Triangulation_3<GT, Tds1>::Point_3 Point_3;
typedef typename Triangulation_3<GT, Tds1>::Geom_traits::Equal_3 Equal_3; typedef typename Triangulation_3<GT, Tds1>::Geom_traits::Equal_3 Equal_3;
typedef typename Triangulation_3<GT, Tds1>::Geom_traits::Compare_xyz_3 Compare_xyz_3; typedef typename Triangulation_3<GT, Tds1>::Geom_traits::Compare_xyz_3 Compare_xyz_3;
typedef typename Triangulation_3<GT, Tds1>::Geom_traits::Construct_point_3 Construct_point_3;
Equal_3 equal = t1.geom_traits().equal_3_object(); Equal_3 equal = t1.geom_traits().equal_3_object();
Compare_xyz_3 cmp1 = t1.geom_traits().compare_xyz_3_object(); Compare_xyz_3 cmp1 = t1.geom_traits().compare_xyz_3_object();
Compare_xyz_3 cmp2 = t2.geom_traits().compare_xyz_3_object(); Compare_xyz_3 cmp2 = t2.geom_traits().compare_xyz_3_object();
Construct_point_3 cp = t1.geom_traits().construct_point_3_object();
// Some quick checks. // Some quick checks.
if (t1.dimension() != t2.dimension() if (t1.dimension() != t2.dimension()
@ -6620,8 +6646,14 @@ operator==(const Triangulation_3<GT, Tds1, Lds> &t1,
using namespace boost; using namespace boost;
std::vector<Point> V1 (t1.points_begin(), t1.points_end()); std::vector<Point> V1 (t1.points_begin(), t1.points_end());
std::vector<Point> V2 (t2.points_begin(), t2.points_end()); std::vector<Point> V2 (t2.points_begin(), t2.points_end());
std::sort(V1.begin(), V1.end(), boost::bind<Comparison_result>(cmp1, _1, _2) == NEGATIVE); std::sort(V1.begin(), V1.end(),
std::sort(V2.begin(), V2.end(), boost::bind<Comparison_result>(cmp2, _1, _2) == NEGATIVE); boost::bind<Comparison_result>(
cmp1, boost::bind<const Point_3&>(cp, _1),
boost::bind<const Point_3&>(cp, _2)) == NEGATIVE);
std::sort(V2.begin(), V2.end(),
boost::bind<Comparison_result>(
cmp2, boost::bind<const Point_3&>(cp, _1),
boost::bind<const Point_3&>(cp, _2)) == NEGATIVE);
return V1 == V2; return V1 == V2;
} }
@ -6651,34 +6683,34 @@ operator==(const Triangulation_3<GT, Tds1, Lds> &t1,
cit != ics.end(); ++cit) { cit != ics.end(); ++cit) {
int inf = (*cit)->index(iv2); int inf = (*cit)->index(iv2);
if (equal(p2, (*cit)->vertex((inf+1)%(dim+1))->point())) if (equal(cp(p2), cp((*cit)->vertex((inf+1)%(dim+1))->point())))
Vmap.insert(std::make_pair(v2, (*cit)->vertex((inf+1)%(dim+1)))); Vmap.insert(std::make_pair(v2, (*cit)->vertex((inf+1)%(dim+1))));
else if (equal(p2, (*cit)->vertex((inf+2)%(dim+1))->point())) else if (equal(cp(p2), cp((*cit)->vertex((inf+2)%(dim+1))->point())))
Vmap.insert(std::make_pair(v2, (*cit)->vertex((inf+2)%(dim+1)))); Vmap.insert(std::make_pair(v2, (*cit)->vertex((inf+2)%(dim+1))));
else if (dim == 3 && else if (dim == 3 &&
equal(p2, (*cit)->vertex((inf+3)%(dim+1))->point())) equal(cp(p2), cp((*cit)->vertex((inf+3)%(dim+1))->point())))
Vmap.insert(std::make_pair(v2, (*cit)->vertex((inf+3)%(dim+1)))); Vmap.insert(std::make_pair(v2, (*cit)->vertex((inf+3)%(dim+1))));
else else
continue; // None matched v2. continue; // None matched v2.
if (equal(p3, (*cit)->vertex((inf+1)%(dim+1))->point())) if (equal(cp(p3), cp((*cit)->vertex((inf+1)%(dim+1))->point())))
Vmap.insert(std::make_pair(v3, (*cit)->vertex((inf+1)%(dim+1)))); Vmap.insert(std::make_pair(v3, (*cit)->vertex((inf+1)%(dim+1))));
else if (equal(p3, (*cit)->vertex((inf+2)%(dim+1))->point())) else if (equal(cp(p3), cp((*cit)->vertex((inf+2)%(dim+1))->point())))
Vmap.insert(std::make_pair(v3, (*cit)->vertex((inf+2)%(dim+1)))); Vmap.insert(std::make_pair(v3, (*cit)->vertex((inf+2)%(dim+1))));
else if (dim == 3 && else if (dim == 3 &&
equal(p3, (*cit)->vertex((inf+3)%(dim+1))->point())) equal(cp(p3), cp((*cit)->vertex((inf+3)%(dim+1))->point())))
Vmap.insert(std::make_pair(v3, (*cit)->vertex((inf+3)%(dim+1)))); Vmap.insert(std::make_pair(v3, (*cit)->vertex((inf+3)%(dim+1))));
else else
continue; // None matched v3. continue; // None matched v3.
if (dim == 3) { if (dim == 3) {
if (equal(p4, (*cit)->vertex((inf+1)%(dim+1))->point())) if (equal(cp(p4), cp((*cit)->vertex((inf+1)%(dim+1))->point())))
Vmap.insert(std::make_pair(v4, Vmap.insert(std::make_pair(v4,
(*cit)->vertex((inf+1)%(dim+1)))); (*cit)->vertex((inf+1)%(dim+1))));
else if (equal(p4, (*cit)->vertex((inf+2)%(dim+1))->point())) else if (equal(cp(p4), cp((*cit)->vertex((inf+2)%(dim+1))->point())))
Vmap.insert(std::make_pair(v4, Vmap.insert(std::make_pair(v4,
(*cit)->vertex((inf+2)%(dim+1)))); (*cit)->vertex((inf+2)%(dim+1))));
else if (equal(p4, (*cit)->vertex((inf+3)%(dim+1))->point())) else if (equal(cp(p4), cp((*cit)->vertex((inf+3)%(dim+1))->point())))
Vmap.insert(std::make_pair(v4, Vmap.insert(std::make_pair(v4,
(*cit)->vertex((inf+3)%(dim+1)))); (*cit)->vertex((inf+3)%(dim+1))));
else else