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

Misc tiny improvements

This commit is contained in:
Mael Rouxel-Labbé 2022-09-26 15:14:29 +02:00
parent 98b6b95054
commit 25df7a7565
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_2.h
View File

@ -107,8 +107,7 @@ private:
bool operator()(const typename Base::All_faces_iterator & fit) const { return !t->is_Delaunay_hyperbolic(fit); } bool operator()(const typename Base::All_faces_iterator & fit) const { return !t->is_Delaunay_hyperbolic(fit); }
bool operator()(const typename Base::All_edges_iterator & eit) const bool operator()(const typename Base::All_edges_iterator & eit) const
{ {
Edge e(eit->first, eit->second); return !t->is_Delaunay_hyperbolic(eit->first, eit->second);
return !t->is_Delaunay_hyperbolic(e);
} }
}; };
@ -549,7 +548,7 @@ private:
/* /*
During the insertion of a new point in the triangulation, the added vertex points to a face. During the insertion of a new point in the triangulation, the added vertex points to a face.
This function ensures that the face to which the vertex points is hyperbolic. This function ensures that the face to which the vertex points is hyperbolic (if there exists one).
*/ */
void ensure_hyperbolic_face_handle(Vertex_handle v) void ensure_hyperbolic_face_handle(Vertex_handle v)
{ {
@ -575,8 +574,8 @@ private:
Oriented_side side_of_hyperbolic_triangle(const Point& p, const Point& q, const Point& r, Oriented_side side_of_hyperbolic_triangle(const Point& p, const Point& q, const Point& r,
const Point& query, Locate_type &lt, int& li) const const Point& query, Locate_type &lt, int& li) const
{ {
// The triangle (p,q,r) must be Delaunay hyperbolic CGAL_precondition(geom_traits().is_Delaunay_hyperbolic_2_object()(p, q, r));
CGAL_triangulation_precondition(geom_traits().is_Delaunay_hyperbolic_2_object()(p, q, r)); CGAL_precondition(query != p && query != q && query != r);
// Point p is assumed to be at index 0, q at index 1 and r at index 2 in the face. // Point p is assumed to be at index 0, q at index 1 and r at index 2 in the face.
li = -1; li = -1;
@ -802,16 +801,23 @@ private:
} }
public: public:
Line_face_circulator line_walk(const Point& p, const Point& q, Face_handle f = Face_handle()) const Line_face_circulator line_walk(const Point& p, const Point& q, Face_handle f = Face_handle()) const
{ {
return Base::line_walk(p, q, f); return Base::line_walk(p, q, f);
} }
Hyperbolic_triangle hyperbolic_triangle(const Face_handle f) const { return Base::triangle(f); } Hyperbolic_triangle hyperbolic_triangle(const Face_handle f) const
{
CGAL_precondition(!is_infinite(f));
return Base::triangle(f);
}
// needed by DT_2: do not document! // needed by DT_2: do not document!
Hyperbolic_triangle triangle(const Face_handle f) const { return hyperbolic_triangle(f); } Hyperbolic_triangle triangle(const Face_handle f) const
{
CGAL_precondition(!is_infinite(f));
return hyperbolic_triangle(f);
}
Hyperbolic_segment hyperbolic_segment(const Face_handle f, const int i) const Hyperbolic_segment hyperbolic_segment(const Face_handle f, const int i) const
{ {
@ -946,26 +952,23 @@ public:
bool is_valid() bool is_valid()
{ {
if (Base::is_valid()) if (!Base::is_valid())
{ return false;
for (Hyperbolic_faces_iterator fit = hyperbolic_faces_begin(); fit != hyperbolic_faces_end(); fit++) for (Hyperbolic_faces_iterator fit = hyperbolic_faces_begin(); fit != hyperbolic_faces_end(); fit++)
{ {
if (!is_Delaunay_hyperbolic(fit)) if (!is_Delaunay_hyperbolic(fit))
{
return false; return false;
} }
}
for (Hyperbolic_edges_iterator eit = hyperbolic_edges_begin(); eit != hyperbolic_edges_end(); eit++) for (Hyperbolic_edges_iterator eit = hyperbolic_edges_begin(); eit != hyperbolic_edges_end(); eit++)
{ {
if (!is_Delaunay_hyperbolic(eit)) if (!is_Delaunay_hyperbolic(eit))
{
return false; return false;
} }
}
return true; return true;
} }
return false;
}
Face_handle locate(const Point& p, const Face_handle hint = Face_handle()) const Face_handle locate(const Point& p, const Face_handle hint = Face_handle()) const
{ {