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

comment out (and fix) code that should not be used anymore 

because cell_iterator should not return more than one cell with the
same entry point (useful in the case where the entry vertex, edge,
or facet is traversed exactly)
This commit is contained in:
Jane Tournois 2016-12-06 11:48:47 +01:00
parent 2f8def4ea0
commit e1b715a56a
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Triangulation_3/include/CGAL/Triangulation_segment_traverser_3.h
View File

@ -652,13 +652,14 @@ public:
case Locate_type::EDGE:
{
while (ltnext == Locate_type::EDGE
&& are_equal(get_edge(), Edge(chnext, linext, ljnext)))
{
++_cell_iterator;
chnext = Cell_handle(_cell_iterator);
_cell_iterator.entry(ltnext, linext, ljnext);
}
//while (ltnext == Locate_type::EDGE
// && _cell_iterator != _cell_iterator.end()
// && are_equal(get_edge(), Edge(chnext, linext, ljnext)))
//{
// ++_cell_iterator;
// chnext = Cell_handle(_cell_iterator);
// _cell_iterator.entry(ltnext, linext, ljnext);
//}
if (_cell_iterator == _cell_iterator.end())
_curr_simplex = Cell_handle(_cell_iterator);
else if (ltnext == Locate_type::EDGE)
@ -706,17 +707,17 @@ public:
{
case Locate_type::VERTEX:
{
while (ltnext == Locate_type::VERTEX
&& _cell_iterator != _cell_iterator.end()
&& get_vertex() == chnext->vertex(linext)//another cell with same vertex has been found
&& !triangulation().is_infinite(chnext))
{
ch = chnext;
//while (ltnext == Locate_type::VERTEX
// && _cell_iterator != _cell_iterator.end()
// && get_vertex() == chnext->vertex(linext)//another cell with same vertex has been found
// && !triangulation().is_infinite(chnext))
//{
// ch = chnext;
++_cell_iterator;
chnext = Cell_handle(_cell_iterator);
_cell_iterator.entry(ltnext, linext, ljnext);
}
// ++_cell_iterator;
// chnext = Cell_handle(_cell_iterator);
// _cell_iterator.entry(ltnext, linext, ljnext);
//}
if (_cell_iterator == _cell_iterator.end())
{
_curr_simplex = Cell_handle(_cell_iterator);