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

Bug fix for remove and contrat operations for CMap and GMap

This commit is contained in:
Guillaume Damiand 2022-11-30 10:36:04 +01:00
parent d381bfbd44
commit 96873950ee
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
View File

@ -107,8 +107,10 @@ namespace CGAL
{ {
// We group the two (i+1)-cells incident if they exist. // We group the two (i+1)-cells incident if they exist.
if ( dg1!=amap.null_descriptor ) if ( dg1!=amap.null_descriptor )
{
CGAL::internal::Group_attribute_functor_run<CMap, i+1>:: CGAL::internal::Group_attribute_functor_run<CMap, i+1>::
run(amap, dg1, dg2); run(amap, dg1, dg2, true); // true because dg1 will be removed
}
} }
// During the operation, we store in modified_darts the darts modified // During the operation, we store in modified_darts the darts modified
@ -353,7 +355,7 @@ namespace CGAL
// We group the two edges incident if they exist. // We group the two edges incident if they exist.
if ( dg1!=amap.null_descriptor ) if ( dg1!=amap.null_descriptor )
CGAL::internal::Group_attribute_functor_run<CMap, 1>:: CGAL::internal::Group_attribute_functor_run<CMap, 1>::
run(amap, dg1, dg2); run(amap, dg1, dg2, true); // true because dg1 will be removed
} }
// During the operation, we store in modified_darts the darts modified // During the operation, we store in modified_darts the darts modified
@ -523,7 +525,7 @@ namespace CGAL
// We group the two (i-1)-cells incident if they exist. // We group the two (i-1)-cells incident if they exist.
if ( dg1!=amap.null_descriptor ) if ( dg1!=amap.null_descriptor )
CGAL::internal::Group_attribute_functor_run<CMap,i-1>:: CGAL::internal::Group_attribute_functor_run<CMap,i-1>::
run(amap, dg1, dg2); run(amap, dg1, dg2, true); // true because dg1 will be removed
} }
// During the operation, we store in modified_darts the darts modified // During the operation, we store in modified_darts the darts modified
@ -677,7 +679,7 @@ namespace CGAL
// We group the two vertices incident if they exist. // We group the two vertices incident if they exist.
if ( dg1!=amap.null_descriptor ) if ( dg1!=amap.null_descriptor )
CGAL::internal::Group_attribute_functor_run<CMap, 0, 1>:: CGAL::internal::Group_attribute_functor_run<CMap, 0, 1>::
run(amap, dg1, dg2); run(amap, dg1, dg2, true); // true because dg1 will be removed
} }
// During the operation, we store in modified_darts the darts modified // During the operation, we store in modified_darts the darts modified

4
Generalized_map/include/CGAL/Generalized_map_operations.h
View File

@ -102,7 +102,7 @@ namespace CGAL
// We group the two (i+1)-cells incident if they exist. // We group the two (i+1)-cells incident if they exist.
if ( dg1!=amap.null_descriptor ) if ( dg1!=amap.null_descriptor )
CGAL::internal::GMap_group_attribute_functor_run<GMap, i+1>:: CGAL::internal::GMap_group_attribute_functor_run<GMap, i+1>::
run(amap, dg1, dg2); run(amap, dg1, dg2, true); // true because dg1 will be deleted
} }
// During the operation, we store in modified_darts the darts modified // During the operation, we store in modified_darts the darts modified
@ -320,7 +320,7 @@ namespace CGAL
// We group the two (i-1)-cells incident if they exist. // We group the two (i-1)-cells incident if they exist.
if ( dg1!=amap.null_descriptor ) if ( dg1!=amap.null_descriptor )
CGAL::internal::GMap_group_attribute_functor_run<GMap,i-1>:: CGAL::internal::GMap_group_attribute_functor_run<GMap,i-1>::
run(amap, dg1, dg2); run(amap, dg1, dg2, true); // true because dg1 will be deleted
} }
// During the operation, we store in modified_darts the darts modified // During the operation, we store in modified_darts the darts modified