use range iterators

This commit is contained in:
Jane Tournois 2020-04-17 16:44:00 +02:00
parent c951383f48
commit 3d181f5fe2
1 changed files with 4 additions and 11 deletions

View File

@ -241,12 +241,9 @@ public:
FT sqmax = emax * emax; FT sqmax = emax * emax;
FT sqmin = emin * emin; FT sqmin = emin * emin;
typedef typename Tr::Finite_edges_iterator Finite_edges_iterator; typedef typename Tr::Edge Edge;
for (Finite_edges_iterator eit = tr().finite_edges_begin(); for (Edge e : tr().finite_edges())
eit != tr().finite_edges_end();
++eit)
{ {
typename Tr::Edge e = *eit;
// skip protected edges // skip protected edges
if (m_protect_boundaries) if (m_protect_boundaries)
{ {
@ -275,9 +272,7 @@ public:
#endif #endif
std::size_t nb_slivers_peel = 0; std::size_t nb_slivers_peel = 0;
typedef typename Tr::Finite_cells_iterator Finite_cells_iterator; for (Cell_handle cit : tr().finite_cell_handles())
for (Finite_cells_iterator cit = tr().finite_cells_begin();
cit != tr().finite_cells_end(); ++cit)
{ {
if(m_c3t3.is_in_complex(cit) && min_dihedral_angle(tr(), cit) < sliver_angle) if(m_c3t3.is_in_complex(cit) && min_dihedral_angle(tr(), cit) < sliver_angle)
{ {
@ -454,9 +449,7 @@ private:
bool check_vertex_dimensions() bool check_vertex_dimensions()
{ {
typename Tr::Finite_vertices_iterator vit; for (Vertex_handle vit : tr().finite_vertex_handles())
for (vit = tr().finite_vertices_begin();
vit != tr().finite_vertices_end(); ++vit)
{ {
// dimension is -1 for Mesh_3 "far points" // dimension is -1 for Mesh_3 "far points"
// for other vertices, it is in [0; 3] // for other vertices, it is in [0; 3]