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

Add a test; add deprecated class Dart

This commit is contained in:
Guillaume Damiand 2016-10-06 13:41:51 -04:00
parent 5e41ec79c4
commit 084c2c8c19
3 changed files with 23 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.h
View File

@ -4360,8 +4360,8 @@ namespace CGAL {
* @return a dart of the new edge, not incident to the vertex of adart1. * @return a dart of the new edge, not incident to the vertex of adart1.
*/ */
Dart_handle insert_dangling_cell_1_in_cell_2( Dart_handle adart1, Dart_handle insert_dangling_cell_1_in_cell_2( Dart_handle adart1,
typename Attribute_handle<0>::type typename Attribute_handle<0>::
ah=null_handle, type ah=null_handle,
bool update_attributes=true ) bool update_attributes=true )
{ {
size_type mark1 = get_new_mark(); size_type mark1 = get_new_mark();
@ -4381,7 +4381,8 @@ namespace CGAL {
size_type treated=get_new_mark(); size_type treated=get_new_mark();
CMap_dart_iterator_basic_of_involution<Self,1> it1(*this, adart1, treated); CMap_dart_iterator_basic_of_involution<Self,1>
it1(*this, adart1, treated);
for ( ; it1.cont(); ++it1) for ( ; it1.cont(); ++it1)
{ {
@ -4423,7 +4424,8 @@ namespace CGAL {
(beta(it1, dim, CGAL_BETAINV(s1), 2), d2, dim); (beta(it1, dim, CGAL_BETAINV(s1), 2), d2, dim);
} }
} }
if (are_attributes_automatically_managed() && update_attributes && ah!=NULL) if (are_attributes_automatically_managed() &&
update_attributes && ah!=NULL)
{ {
internal::Set_i_attribute_of_dart_functor<Self, 0>::run(this, d1, ah); internal::Set_i_attribute_of_dart_functor<Self, 0>::run(this, d1, ah);
} }

5
Combinatorial_map/include/CGAL/Combinatorial_map_dart.h
View File

@ -239,6 +239,11 @@ namespace CGAL {
typename Helper::Attribute_handles mattribute_handles; typename Helper::Attribute_handles mattribute_handles;
}; };
/// Old name, kept for backward compatibility
template <unsigned int d, typename Refs>
struct CGAL_DEPRECATED Dart : public Combinatorial_map_dart<d, Refs>
{};
} // namespace CGAL } // namespace CGAL
#endif // CGAL_COMBINATORIAL_MAP_DART_H // #endif // CGAL_COMBINATORIAL_MAP_DART_H //

14
Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h
View File

@ -1128,8 +1128,6 @@ bool test3D()
d2 = map.make_combinatorial_hexahedron(); d2 = map.make_combinatorial_hexahedron();
map.template sew<3>(d1,d2); map.template sew<3>(d1,d2);
d3 = map.beta(d1, 2); d3 = map.beta(d1, 2);
d4 = map.beta(d1, 1,3,1,2);
assert(d4==map.beta(d1,1,3,1,2));
map.display_characteristics(cout) << ", valid=" << map.is_valid() << endl; map.display_characteristics(cout) << ", valid=" << map.is_valid() << endl;
cout << "remove facet4: " << flush; map.template remove_cell<2>(d1); cout << "remove facet4: " << flush; map.template remove_cell<2>(d1);
map.display_characteristics(cout) << ", valid=" << map.is_valid() << endl; map.display_characteristics(cout) << ", valid=" << map.is_valid() << endl;
@ -1137,6 +1135,18 @@ bool test3D()
v.push_back(map.beta(v[1],1,2,1)); v.push_back(map.beta(v[2],1,2,1)); v.push_back(map.beta(v[1],1,2,1)); v.push_back(map.beta(v[2],1,2,1));
cout << "insert facet4: " << flush; map.insert_cell_2_in_cell_3(v.begin(),v.end()); cout << "insert facet4: " << flush; map.insert_cell_2_in_cell_3(v.begin(),v.end());
map.display_characteristics(cout) << ", valid=" << map.is_valid() << endl; map.display_characteristics(cout) << ", valid=" << map.is_valid() << endl;
Map map2;
d1 = map2.make_combinatorial_hexahedron();
d2 = map2.make_combinatorial_hexahedron();
map2.template sew<3>(d1,d2);
if ( !map.is_isomorphic_to(map2) )
{
std::cout<<"Error: map and map2 are not isomorphic (after insertion/removal).\n";
assert(false);
return false;
}
map.clear(); v.clear(); map.clear(); v.clear();
cout << "***************************** TEST INSERT FACET 3D DONE." cout << "***************************** TEST INSERT FACET 3D DONE."