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

Bugfix in degree and codegree

This commit is contained in:
Guillaume Damiand 2018-09-04 16:11:22 +02:00
parent 3f005bbbc4
commit 241a9f3353
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h
View File

@ -265,8 +265,8 @@ namespace CGAL
* @return the degree of the cell. * @return the degree of the cell.
*/ */
template < class Map, unsigned int i > template < class Map, unsigned int i >
typename Map::size_type degree( const Map & amap, typename Map::size_type degree(const Map & amap,
typename Map::Dart_const_handle adart ) typename Map::Dart_const_handle adart)
{ {
CGAL_assertion(adart != NULL); CGAL_assertion(adart != NULL);
@ -280,20 +280,20 @@ namespace CGAL
Dart_of_cell_basic_range<i>::const_iterator it(amap, adart, mark); Dart_of_cell_basic_range<i>::const_iterator it(amap, adart, mark);
for ( ;it.cont(); ++it ) for ( ;it.cont(); ++it )
{ {
if (!amap.is_marked(*it, treated)) if (!amap.is_marked(it, treated))
{ {
++nbIncident; ++nbIncident;
CGAL::mark_cell<Map,i+1>(amap, *it, treated); CGAL::mark_cell<Map,i+1>(amap, it, treated);
} }
amap.mark(*it,mark); amap.mark(it,mark);
} }
amap.negate_mark(mark); amap.negate_mark(mark);
for (it.rewind(); it.cont(); ++it) for (it.rewind(); it.cont(); ++it)
{ {
if (amap.is_marked(*it, treated)) if (amap.is_marked(it, treated))
CGAL::unmark_cell<Map,i+1>(amap, *it, treated); { CGAL::unmark_cell<Map,i+1>(amap, it, treated); }
amap.mark(*it,mark); amap.mark(it,mark);
} }
amap.negate_mark(mark); amap.negate_mark(mark);
@ -329,20 +329,20 @@ namespace CGAL
Dart_of_cell_basic_range<i>::const_iterator it(amap, adart, mark); Dart_of_cell_basic_range<i>::const_iterator it(amap, adart, mark);
for ( ; it.cont(); ++it) for ( ; it.cont(); ++it)
{ {
if (!amap.is_marked(*it, treated)) if (!amap.is_marked(it, treated))
{ {
++nbIncident; ++nbIncident;
CGAL::mark_cell<Map,i-1>(amap, *it, treated); CGAL::mark_cell<Map,i-1>(amap, it, treated);
} }
amap.mark(*it,mark); amap.mark(it,mark);
} }
amap.negate_mark(mark); amap.negate_mark(mark);
for (it.rewind(); it.cont(); ++it) for (it.rewind(); it.cont(); ++it)
{ {
if (amap.is_marked(*it, treated)) if (amap.is_marked(it, treated))
CGAL::unmark_cell<Map,i-1>(amap, *it, treated); { CGAL::unmark_cell<Map,i-1>(amap, it, treated); }
amap.mark(*it,mark); amap.mark(it,mark);
} }
amap.negate_mark(mark); amap.negate_mark(mark);