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

Fixes

This commit is contained in:
Maxime Gimeno 2018-01-22 15:48:21 +01:00
parent fc729e770d
commit 153bc0c76a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BGL/include/CGAL/boost/graph/helpers.h
View File

@ -361,6 +361,8 @@ bool is_valid_face_descriptor( typename boost::graph_traits<FaceGraph>::face_des
* \brief is_valid_polygon_mesh checks the integrity of a `PolygonMesh`.
* \param g the `PolygonMesh` to test.
* \param verb : if `true`, the details of the check will be written in the standard output.
*
* \tparam PolygonMesh a model of `FaceListGraph` and `HalfedgeListGraph`
* \return `true` if the `PolygonMesh` is valid, `false` otherwise.
*/
template <typename PolygonMesh>
@ -376,7 +378,7 @@ bool is_valid_polygon_mesh(const PolygonMesh& g, bool verb = false)
typedef typename boost::graph_traits<PolygonMesh>::halfedges_size_type halfedges_size_type;
typedef typename boost::graph_traits<PolygonMesh>::faces_size_type faces_size_type;
Verbose_ostream verr(verb);
int num_v(std::distance(boost::begin(vertices(g)), boost::end(vertices(g)))),
std::size_t num_v(std::distance(boost::begin(vertices(g)), boost::end(vertices(g)))),
num_h(std::distance(boost::begin(halfedges(g)), boost::end(halfedges(g)))),
num_f(std::distance(boost::begin(faces(g)), boost::end(faces(g))));
bool valid = ( 1 != (num_h& 1));
@ -411,6 +413,7 @@ bool is_valid_polygon_mesh(const PolygonMesh& g, bool verb = false)
}
// previous integrity.
valid = valid && ( prev(next(begin, g), g) == begin);
valid = valid && ( next(prev(begin, g), g) == begin);
if ( ! valid) {
verr << " previous pointer integrity corrupted."
<< std::endl;
@ -443,7 +446,7 @@ bool is_valid_polygon_mesh(const PolygonMesh& g, bool verb = false)
if ( is_border(begin, g))
++nb;
}
verr << "summe border halfedges (2*nb) = " << 2 * nb << std::endl;
verr << "sum border halfedges (2*nb) = " << 2 * nb << std::endl;
if ( valid && n != num_h)
verr << "counting halfedges failed." << std::endl;
// All vertices.

2
HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h
View File

@ -261,7 +261,7 @@ is_valid( bool verb, int level) const {
if ( begin->is_border())
++nb;
}
verr << "summe border halfedges (2*nb) = " << 2 * nb << std::endl;
verr << "sum border halfedges (2*nb) = " << 2 * nb << std::endl;
if ( valid && n != hds->size_of_halfedges())
verr << "counting halfedges failed." << std::endl;
if ( valid && level >= 4 && (nb != hds->size_of_border_halfedges()))