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

Call scan_edges and scan_vertices from Mesher_3 

Before that the logic was hidden in `no_longer_element_to_refine_impl()`.
This commit is contained in:
Laurent Rineau 2017-02-17 18:53:49 +01:00
parent a5b5503325
commit 38c7bbaa9f
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
View File

@ -331,6 +331,10 @@ Mesher_3<C3T3,MC,MD>::refine_mesh(std::string dump_after_refine_surface_prefix)
WallClockTimer t;
#endif
facets_mesher_.refine(facets_visitor_);
facets_mesher_.scan_edges();
facets_mesher_.refine(facets_visitor_);
facets_mesher_.scan_vertices();
facets_mesher_.refine(facets_visitor_);
#ifdef CGAL_MESH_3_PROFILING
double facet_ref_time = t.elapsed();
std::cerr << "==== Facet refinement: " << facet_ref_time << " seconds ===="

24
Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h
View File

@ -358,9 +358,10 @@ public:
#endif
}
private:
public:
// Initialization function
void initialize_manifold_info() {
void scan_edges() {
if(!m_with_manifold_criterion) return;
#ifdef CGAL_MESH_3_VERBOSE
std::cerr << "\nscanning edges ";
if(m_with_boundary)
@ -400,8 +401,9 @@ private:
#endif
}
void initialize_bad_vertices()
void scan_vertices()
{
if(!m_with_manifold_criterion) return;
CGAL_assertion(m_bad_vertices_initialized == false);
CGAL_assertion(m_bad_vertices.empty());
#ifdef CGAL_MESH_3_VERBOSE
@ -461,20 +463,10 @@ public:
if(Base::no_longer_element_to_refine_impl())
{
if(!m_with_manifold_criterion) return true;
// Disable the manifold criterion
if( ! m_manifold_info_initialized ) initialize_manifold_info();
if(m_bad_edges.left.empty() &&
Base::no_longer_element_to_refine_impl() /* for parallel */)
{
if( ! m_bad_vertices_initialized ) initialize_bad_vertices();
return m_bad_vertices.empty() &&
Base::no_longer_element_to_refine_impl() /* for parallel */;
}
else // m_bad_vertices is not empty
return false;
// Note: with Parallel_tag, `m_bad_vertices` and `m_bad_edges`
// are always empty.
return m_bad_edges.left.empty() && m_bad_vertices.empty();
}
else // Base::no_longer_element_to_refine_impl() returned false
return false;