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

Fix the FIXMEs: "infinite vertex is NOT at index 0 a priori"

This commit is contained in:
Clement Jamin 2014-12-10 17:32:54 +01:00
parent d558985a14
commit f277603c05
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Triangulation/include/CGAL/Delaunay_triangulation.h
View File

@ -703,8 +703,9 @@ Delaunay_triangulation<DCTraits, TDS>
reset_flat_orientation(); reset_flat_orientation();
if( 1 <= current_dimension() ) if( 1 <= current_dimension() )
{ {
// FIXME: infinite vertex is NOT at index 0 a priori. Full_cell_handle inf_v_cell = infinite_vertex()->full_cell();
Full_cell_handle s = infinite_vertex()->full_cell()->neighbor(0); int inf_v_index = inf_v_cell->index(infinite_vertex());
Full_cell_handle s = inf_v_cell->neighbor(inf_v_index);
Orientation o = orientation(s); Orientation o = orientation(s);
CGAL_assertion( ZERO != o ); CGAL_assertion( ZERO != o );
if( NEGATIVE == o ) if( NEGATIVE == o )

30
Triangulation/include/CGAL/Triangulation.h
View File

@ -696,8 +696,8 @@ public:
Full_cell_handle n = s->neighbor(i); Full_cell_handle n = s->neighbor(i);
if( ! t_.is_infinite(n) ) if( ! t_.is_infinite(n) )
return false; return false;
// FIXME: infinite vertex is NOT at index 0 a priori. int inf_v_index = n->index(infinite_vertex());
n->vertex(0)->set_point(p_); n->vertex(inf_v_index)->set_point(p_);
bool ok = (POSITIVE == ori_(t_.points_begin(n), t_.points_begin(n) + cur_dim_ + 1)); bool ok = (POSITIVE == ori_(t_.points_begin(n), t_.points_begin(n) + cur_dim_ + 1));
return ok; return ok;
} }
@ -850,8 +850,8 @@ Triangulation<TT, TDS>
// infinite one... // infinite one...
CGAL_precondition( is_infinite(s) ); CGAL_precondition( is_infinite(s) );
CGAL_precondition( 1 == current_dimension() ); CGAL_precondition( 1 == current_dimension() );
// FIXME: infinite vertex is NOT at index 0 a priori. But I'm not sure it's a problem here. int inf_v_index = s->index(infinite_vertex());
bool swap = (0 == s->neighbor(0)->index(s)); bool swap = (0 == s->neighbor(inf_v_index)->index(s));
Vertex_handle v = tds().insert_in_full_cell(s); Vertex_handle v = tds().insert_in_full_cell(s);
v->set_point(p); v->set_point(p);
if( swap ) if( swap )
@ -888,8 +888,9 @@ Triangulation<TT, TDS>
ochtp(*this, p, ori); ochtp(*this, p, ori);
tds().gather_full_cells(s, ochtp, out); tds().gather_full_cells(s, ochtp, out);
} }
// FIXME: infinite vertex is NOT at index 0 a priori. int inf_v_index = s->index(infinite_vertex());
Vertex_handle v = insert_in_hole(p, simps.begin(), simps.end(), Facet(s, 0)); Vertex_handle v = insert_in_hole(
p, simps.begin(), simps.end(), Facet(s, inf_v_index));
return v; return v;
} }
@ -905,8 +906,9 @@ Triangulation<TT, TDS>
v->set_point(p); v->set_point(p);
if( current_dimension() >= 1 ) if( current_dimension() >= 1 )
{ {
// FIXME: infinite vertex is NOT at index 0 a priori. Full_cell_handle inf_v_cell = infinite_vertex()->full_cell();
Full_cell_handle s = infinite_vertex()->full_cell()->neighbor(0); int inf_v_index = inf_v_cell->index(infinite_vertex());
Full_cell_handle s = inf_v_cell->neighbor(inf_v_index);
Orientation o = orientation(s); Orientation o = orientation(s);
CGAL_assertion( COPLANAR != o ); CGAL_assertion( COPLANAR != o );
if( NEGATIVE == o ) if( NEGATIVE == o )
@ -958,15 +960,21 @@ Triangulation<TT, TDS>
// if we don't know where to start, we start from any bounded full_cell // if we don't know where to start, we start from any bounded full_cell
if( Full_cell_handle() == start ) if( Full_cell_handle() == start )
{
// THE HACK THAT NOBODY SHOULD DO... BUT DIFFICULT TO WORK AROUND // THE HACK THAT NOBODY SHOULD DO... BUT DIFFICULT TO WORK AROUND
// THIS... TODO: WORK AROUND IT // THIS... TODO: WORK AROUND IT
// FIXME: infinite vertex is NOT at index 0 a priori. Full_cell_handle inf_c = const_cast<Self*>(this)->infinite_full_cell();
s = const_cast<Self*>(this)->infinite_full_cell()->neighbor(0); int inf_v_index = inf_c->index(infinite_vertex());
s = inf_c->neighbor(inf_v_index);
}
else else
{ {
s = start; s = start;
if( is_infinite(s) ) if( is_infinite(s) )
s = s->neighbor(0); // FIXME: index of infinite vertex is not zero ( not 0) {
int inf_v_index = s->index(infinite_vertex());
s = s->neighbor(inf_v_index);
}
} }
// Check if query |p| is outside the affine hull // Check if query |p| is outside the affine hull