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

updated traits class by replacing Side_of_hyperbolic_triangle with Side_of_oriented_hyperbolic_segment; added function side_of_hyperbolic_triangle to class Periodic_4_hyperbolic_triangulation; changed locate() function to more efficient version

This commit is contained in:
Iordan Iordanov 2018-08-12 09:54:57 +02:00
parent 3a57de65fe
commit 3316037fad
2 changed files with 90 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_traits_2.h
View File

@ -237,7 +237,7 @@ public:
typedef Periodic_4_hyperbolic_construct_point_2<Self,
typename Base::Construct_point_2> Construct_point_2;
typedef Hyperbolic_traits_with_translations_2_adaptor<Self,
typename Base::Side_of_hyperbolic_triangle_2> Side_of_hyperbolic_triangle_2;
typename Base::Side_of_oriented_hyperbolic_segment_2> Side_of_oriented_hyperbolic_segment_2;
public:
@ -248,9 +248,9 @@ public:
}
Side_of_hyperbolic_triangle_2
side_of_hyperbolic_triangle_2_object() const {
return Side_of_hyperbolic_triangle_2();
Side_of_oriented_hyperbolic_segment_2
side_of_oriented_hyperbolic_segment_2_object() const {
return Side_of_oriented_hyperbolic_segment_2();
}
class Compute_approximate_hyperbolic_diameter {

136
Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_triangulation_2.h
View File

@ -73,13 +73,14 @@ private:
public:
typedef GT Geom_traits;
typedef TDS Triangulation_data_structure;
typedef typename GT::Hyperbolic_translation Hyperbolic_translation;
typedef typename GT::Circle_2 Circle;
typedef typename GT::Point_2 Point;
typedef typename GT::Segment_2 Segment;
typedef typename GT::Triangle_2 Triangle;
typedef GT Geom_traits;
typedef TDS Triangulation_data_structure;
typedef typename GT::Hyperbolic_translation Hyperbolic_translation;
typedef typename GT::Circle_2 Circle;
typedef typename GT::Point_2 Point;
typedef typename GT::Segment_2 Segment;
typedef typename GT::Triangle_2 Triangle;
typedef typename GT::Side_of_oriented_hyperbolic_segment_2 Side_of_oriented_hyperbolic_segment;
typedef std::pair<Point, Hyperbolic_translation> Periodic_point;
typedef array< std::pair<Point, Hyperbolic_translation>, 2 > Periodic_segment;
@ -398,6 +399,73 @@ protected:
return euclidean_locate(p, lt, li, lo, f);
}
Oriented_side side_of_hyperbolic_triangle(const Point p, const Point q, const Point r,
const Point query, Locate_type &lt, int& li) const {
// Point p is assumed to be at index 0, q at index 1 and r at index 2 in the face.
li = -1;
if (query == p) {
lt = VERTEX;
li = 0;
return ON_ORIENTED_BOUNDARY;
}
if (query == q) {
lt == VERTEX;
li = 1;
return ON_ORIENTED_BOUNDARY;
}
if (query == r) {
lt == VERTEX;
li = 2;
return ON_ORIENTED_BOUNDARY;
}
Oriented_side cp1 = Side_of_oriented_hyperbolic_segment()(p, q, query);
if (cp1 == ON_ORIENTED_BOUNDARY) {
lt = EDGE;
li = 2;
return ON_ORIENTED_BOUNDARY;
}
Oriented_side cp2 = Side_of_oriented_hyperbolic_segment()(q, r, query);
if (cp2 == ON_ORIENTED_BOUNDARY) {
lt = EDGE;
li = 0;
return ON_ORIENTED_BOUNDARY;
}
Oriented_side cp3 = Side_of_oriented_hyperbolic_segment()(r, p, query);
if (cp3 == ON_ORIENTED_BOUNDARY) {
lt = EDGE;
li = 1;
return ON_ORIENTED_BOUNDARY;
}
Oriented_side cs1 = Side_of_oriented_hyperbolic_segment()(p, q, r);
Oriented_side cs2 = Side_of_oriented_hyperbolic_segment()(q, r, p);
Oriented_side cs3 = Side_of_oriented_hyperbolic_segment()(r, p, q);
// Cannot be on the boundary here.
lt = FACE;
if (cs1 != cp1) {
li = 2;
return ON_NEGATIVE_SIDE;
}
if (cs2 != cp2){
li = 0;
return ON_NEGATIVE_SIDE;
}
if (cs3 != cp3) {
li = 1;
return ON_NEGATIVE_SIDE;
}
return ON_POSITIVE_SIDE;
}
public:
Face_handle hyperbolic_periodic_locate(const Point& p, Locate_type& lt, int& li, Hyperbolic_translation& lo, const Face_handle fh = Face_handle()) const;
@ -956,54 +1024,25 @@ hyperbolic_periodic_locate(const Point& p, Locate_type& lt, int& li, Hyperbolic_
return lf;
}
typedef typename GT::Side_of_hyperbolic_triangle_2 Side_of_hyperbolic_triangle_2;
Side_of_hyperbolic_triangle_2 sf;
//typedef typename GT::Side_of_hyperbolic_triangle_2 Side_of_hyperbolic_triangle_2;
//Side_of_hyperbolic_triangle_2 sf;
Point p0 = construct_point( construct_point(lf->vertex(0)->point(), lf->translation(0)) , lo );
Point p1 = construct_point( construct_point(lf->vertex(1)->point(), lf->translation(1)) , lo );
Point p2 = construct_point( construct_point(lf->vertex(2)->point(), lf->translation(2)) , lo );
Bounded_side bs = sf(p0, p1, p2, p, li);
if (bs == ON_BOUNDED_SIDE) {
lt = FACE;
} else if (bs == ON_BOUNDARY) {
lt = EDGE;
} else {
// Here we have to find the face containing the point, it's one of the neighbors of lf.
Hyperbolic_translation tr = lo * neighbor_translation(lf, 0);
Face_handle nf = lf->neighbor(0);
Oriented_side os = side_of_hyperbolic_triangle(p0, p1, p2, p, lt, li);
if (os == ON_NEGATIVE_SIDE) {
Hyperbolic_translation tr = lo * neighbor_translation(lf, li);
Face_handle nf = lf->neighbor(li);
Point np0 = construct_point( construct_point(nf->vertex(0)->point(), nf->translation(0)) , tr );
Point np1 = construct_point( construct_point(nf->vertex(1)->point(), nf->translation(1)) , tr );
Point np2 = construct_point( construct_point(nf->vertex(2)->point(), nf->translation(2)) , tr );
Bounded_side bs1 = sf(np0, np1, np2, p, li);
if (bs1 == ON_BOUNDED_SIDE) {
lo = tr;
lf = nf;
lt = FACE;
} else {
tr = lo * neighbor_translation(lf, 1);
nf = lf->neighbor(1);
np0 = construct_point( construct_point(nf->vertex(0)->point(), nf->translation(0)) , tr );
np1 = construct_point( construct_point(nf->vertex(1)->point(), nf->translation(1)) , tr );
np2 = construct_point( construct_point(nf->vertex(2)->point(), nf->translation(2)) , tr );
Bounded_side bs2 = sf(np0, np1, np2, p, li);
if (bs2 == ON_BOUNDED_SIDE) {
lo = tr;
lf = nf;
lt = FACE;
} else {
tr = lo * neighbor_translation(lf, 2);
nf = lf->neighbor(2);
np0 = construct_point( construct_point(nf->vertex(0)->point(), nf->translation(0)) , tr );
np1 = construct_point( construct_point(nf->vertex(1)->point(), nf->translation(1)) , tr );
np2 = construct_point( construct_point(nf->vertex(2)->point(), nf->translation(2)) , tr );
Bounded_side bs3 = sf(np0, np1, np2, p, li);
CGAL_triangulation_assertion(bs3 == ON_BOUNDED_SIDE);
lo = tr;
lf = nf;
lt = FACE;
}
}
Oriented_side os1 = side_of_hyperbolic_triangle(np0, np1, np2, p, lt, li);
CGAL_triangulation_assertion(os1 == ON_POSITIVE_SIDE);
lo = tr;
return nf;
}
return lf;
@ -1011,9 +1050,6 @@ hyperbolic_periodic_locate(const Point& p, Locate_type& lt, int& li, Hyperbolic_
} // namespace CGAL