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

Merge pull request #6042 from sloriot/SMS-expensive_macros 

Hide expensive assertions behind _expensive_ macros
This commit is contained in:
Laurent Rineau 2021-10-29 16:46:48 +02:00
parent 544f94101c 75e6e4500f
commit 393abddc64
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h
View File

@ -447,7 +447,7 @@ int
EdgeCollapse<TM,GT,SP,VIM,VPM,HIM,ECM,CF,PF,SI,V>:: EdgeCollapse<TM,GT,SP,VIM,VPM,HIM,ECM,CF,PF,SI,V>::
run() run()
{ {
CGAL_precondition(is_valid_polygon_mesh(m_tm) && CGAL::is_triangle_mesh(m_tm)); CGAL_expensive_precondition(is_valid_polygon_mesh(m_tm) && CGAL::is_triangle_mesh(m_tm));
m_visitor.OnStarted(m_tm); m_visitor.OnStarted(m_tm);
@ -1127,7 +1127,7 @@ collapse(const Profile& profile,
--m_current_edge_count; --m_current_edge_count;
CGAL_assertion_code( CGAL_expensive_assertion_code(
size_type resulting_vertex_count = size_type(vertices(m_tm).size()); size_type resulting_vertex_count = size_type(vertices(m_tm).size());
size_type result_edge_count = size_type(edges(m_tm).size()); size_type result_edge_count = size_type(edges(m_tm).size());
); );
@ -1152,7 +1152,7 @@ collapse(const Profile& profile,
} }
--m_current_edge_count; --m_current_edge_count;
CGAL_assertion_code(--result_edge_count); CGAL_expensive_assertion_code(--result_edge_count);
} }
if(profile.right_face_exists()) if(profile.right_face_exists())
@ -1173,7 +1173,7 @@ collapse(const Profile& profile,
} }
--m_current_edge_count; --m_current_edge_count;
CGAL_assertion_code(--result_edge_count); CGAL_expensive_assertion_code(--result_edge_count);
} }
CGAL_SMS_TRACE(1, "Removing:\n v0v1: E" << get_edge_id(profile.v0_v1()) CGAL_SMS_TRACE(1, "Removing:\n v0v1: E" << get_edge_id(profile.v0_v1())
@ -1188,11 +1188,11 @@ collapse(const Profile& profile,
// All directed edges incident to vertex removed are relink to the vertex kept. // All directed edges incident to vertex removed are relink to the vertex kept.
v_res = halfedge_collapse_bk_compatibility(profile.v0_v1(), m_ecm); v_res = halfedge_collapse_bk_compatibility(profile.v0_v1(), m_ecm);
CGAL_assertion_code(--result_edge_count); CGAL_expensive_assertion_code(--result_edge_count);
CGAL_assertion_code(--resulting_vertex_count); CGAL_expensive_assertion_code(--resulting_vertex_count);
CGAL_assertion(result_edge_count == edges(m_tm).size()); CGAL_expensive_assertion(result_edge_count == edges(m_tm).size());
CGAL_assertion(resulting_vertex_count == vertices(m_tm).size()); CGAL_expensive_assertion(resulting_vertex_count == vertices(m_tm).size());
CGAL_expensive_assertion(is_valid_polygon_mesh(m_tm) && CGAL::is_triangle_mesh(m_tm)); CGAL_expensive_assertion(is_valid_polygon_mesh(m_tm) && CGAL::is_triangle_mesh(m_tm));
CGAL_SMS_TRACE(1, "V" << get(m_vim, v_res) << " kept."); CGAL_SMS_TRACE(1, "V" << get(m_vim, v_res) << " kept.");