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

Merge pull request #5376 from lrineau/Mesh_3-fix_mesh_implicit_domains.cpp-GF 

Fix examples/Mesh_3/mesh_implicit_domains.cpp
This commit is contained in:
Laurent Rineau 2021-02-05 16:10:24 +01:00
parent 41765b6a26 6fe18d8068
commit 1453294c74
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mesh_3/examples/Mesh_3/CMakeLists.txt
View File

@ -173,6 +173,7 @@ if(CGAL_ACTIVATE_CONCURRENT_MESH_3 AND TARGET CGAL::TBB_support)
mesh_3D_image_variable_size
mesh_3D_image_with_custom_initialization
mesh_3D_image_with_features
mesh_implicit_domains
mesh_implicit_sphere
mesh_implicit_sphere_variable_size
mesh_optimization_example

2
Mesh_3/include/CGAL/Mesh_3/Refine_cells_3.h
View File

@ -470,7 +470,7 @@ public:
std::string debug_info_element_impl(const Cell_handle &ch) const
{
std::stringstream sstr;
sstr << "Cell { " << std::endl
sstr << "Cell " << (void*)(ch.operator->()) << " { " << std::endl
<< " " << *ch->vertex(0) << std::endl
<< " " << *ch->vertex(1) << std::endl
<< " " << *ch->vertex(2) << std::endl

6
Mesh_3/include/CGAL/Mesh_3/mesh_standard_cell_criteria.h
View File

@ -104,7 +104,7 @@ protected:
if ( size > min_sq_length*sq_radius_edge_bound_ )
{
#ifdef CGAL_MESH_3_DEBUG_CELL_CRITERIA
std::cerr << "bad cell (radius-edge bound): radius-edge["
std::cerr << "bad cell " << (void*)(ch.operator->()) << " (radius-edge bound): radius-edge["
<< size/min_sq_length << "] bound[" << sq_radius_edge_bound_
<< "]\n" ;
#endif
@ -185,7 +185,7 @@ protected:
if ( size > sq_radius_bound_ )
{
#ifdef CGAL_MESH_3_DEBUG_CELL_CRITERIA
std::cerr << "bad cell (radius bound): size[" << size
std::cerr << "bad cell " << (void*)(ch.operator->()) << " (radius bound): size[" << size
<< "] bound[" << sq_radius_bound_ << "]\n" ;
#endif
return Is_bad(Quality(sq_radius_bound_/size));
@ -262,7 +262,7 @@ protected:
if ( size > sq_bound )
{
#ifdef CGAL_MESH_3_DEBUG_CELL_CRITERIA
std::cerr << "bad cell (radius bound): size[" << size
std::cerr << "bad cell " << (void*)(ch.operator->()) << " (radius bound): size[" << size
<< "] bound[" << sq_bound << "]\n" ;
#endif
return Is_bad(Quality(sq_bound/size));

25
Mesher_level/include/CGAL/Meshes/Double_map_container.h
View File

@ -42,12 +42,25 @@ namespace CGAL {
return m.empty();
}
#if CGAL_MESHES_DEBUG_DOUBLE_MAP
template <typename Element_type>
std::ostream& debug_element(std::ostream& os, const Element_type& e) {
return os << (void*)(e.operator->());
}
template <typename Cell_handle>
std::ostream& debug_element(std::ostream& os, const std::pair<Cell_handle, int>& e) {
return os << "Facet{" << (void*)(e.first.operator->()) << ", " << e.second << "}";
}
#endif
Element get_next_element_impl()
{
CGAL_assertion(!m.empty());
#if CGAL_MESHES_DEBUG_DOUBLE_MAP
std::cerr << "get_next_element_impl(" << &*(m.front()->second)
<< ")\n";
std::cerr << "get_next_element_impl(";
debug_element(std::cerr, m.front()->second);
std::cerr << ")\n";
#endif
return m.front()->second;
@ -56,7 +69,9 @@ namespace CGAL {
void add_bad_element(const Element& e, const Quality& q)
{
#if CGAL_MESHES_DEBUG_DOUBLE_MAP
std::cerr << "add_bad_element(" << &*e << ")\n";
std::cerr << "add_bad_element(";
debug_element(std::cerr, e);
std::cerr << ")\n";
#endif
m.insert(e, q);
}
@ -69,7 +84,9 @@ namespace CGAL {
void remove_element(const Element& e)
{
#if CGAL_MESHES_DEBUG_DOUBLE_MAP
std::cerr << "remove_element(" << &*e << ")\n";
std::cerr << "remove_element(";
debug_element(std::cerr, e);
std::cerr << ")\n";
#endif
m.erase(e);
}