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

Merge pull request #2713 from sloriot/BGL-fix_assertions_FFG 

Fix assertions
This commit is contained in:
Laurent Rineau 2018-01-17 10:43:14 +01:00
parent f7cbe80c7d 8ac58e96c5
commit 2ec646a046
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BGL/include/CGAL/boost/graph/Face_filtered_graph.h
View File

@ -25,6 +25,7 @@
#include <CGAL/boost/graph/properties.h> #include <CGAL/boost/graph/properties.h>
#include <CGAL/boost/graph/iterator.h> #include <CGAL/boost/graph/iterator.h>
#include <CGAL/boost/graph/named_function_params.h> #include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/assertions.h> #include <CGAL/assertions.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
@ -898,7 +899,7 @@ next(typename boost::graph_traits< Face_filtered_graph<Graph, FIMap, VIMap, HIMa
return next(h, w.graph()); return next(h, w.graph());
//h is on the border of the selection //h is on the border of the selection
CGAL_assertion( !w.is_in_cc(face(h, w.graph())) ); CGAL_assertion( is_border(h, w.graph()) || !w.is_in_cc(face(h, w.graph())) );
typedef typename boost::graph_traits< Face_filtered_graph<Graph, FIMap, VIMap, HIMap> >::halfedge_descriptor h_d; typedef typename boost::graph_traits< Face_filtered_graph<Graph, FIMap, VIMap, HIMap> >::halfedge_descriptor h_d;
h_d candidate = next(h, w.graph()); h_d candidate = next(h, w.graph());
CGAL_assertion(!w.is_in_cc(candidate)); CGAL_assertion(!w.is_in_cc(candidate));
@ -923,7 +924,7 @@ prev(typename boost::graph_traits< Face_filtered_graph<Graph, FIMap, VIMap, HIMa
return prev(h, w.graph()); return prev(h, w.graph());
//h is on the border of the selection //h is on the border of the selection
CGAL_assertion( !w.is_in_cc(face(h, w.graph())) ); CGAL_assertion( is_border(h, w.graph()) || !w.is_in_cc(face(h, w.graph())) );
typedef typename boost::graph_traits< Face_filtered_graph<Graph, FIMap, VIMap, HIMap> >::halfedge_descriptor h_d; typedef typename boost::graph_traits< Face_filtered_graph<Graph, FIMap, VIMap, HIMap> >::halfedge_descriptor h_d;
h_d candidate = prev(h, w.graph()); h_d candidate = prev(h, w.graph());
CGAL_assertion(!w.is_in_cc(candidate)); CGAL_assertion(!w.is_in_cc(candidate));