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

Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch'

This commit is contained in:
Sébastien Loriot 2015-11-23 09:55:22 +01:00
parent 059ec8cb81 019856b8c4
commit 554036b699
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BGL/include/CGAL/boost/graph/iterator.h
View File

@ -524,7 +524,7 @@ public:
{}
Halfedge_around_source_circulator(halfedge_descriptor hd, const Graph& g)
: Halfedge_around_source_circulator::iterator_adaptor_(Halfedge_around_target_circulator<Graph>(hd,g)), opp(g)
: Halfedge_around_source_circulator::iterator_adaptor_(Halfedge_around_target_circulator<Graph>(opposite(hd,g),g)), opp(g)
{}
Halfedge_around_source_circulator(vertex_descriptor vd, const Graph& g)

11
BGL/test/BGL/test_circulator.cpp
View File

@ -67,8 +67,10 @@ int main(int, char* argv[])
{
halfedge_around_target_circulator havc(hd,P), done(havc);
vertex_descriptor vd = target(hd,P);
do {
halfedge_descriptor hd2 = *havc;
assert(target(hd2,P) == vd);
std::cout << get(CGAL::vertex_point, P, target(*havc,P)) << std::endl;
++havc;
}while(havc != done);
@ -91,8 +93,10 @@ int main(int, char* argv[])
}
{
halfedge_around_source_circulator havc(hd,P), done(havc);
vertex_descriptor vd = source(hd,P);
do {
halfedge_descriptor hd2 = *havc;
assert(source(hd2,P) == vd);
std::cout << get(CGAL::vertex_point, P, target(*havc,P)) << std::endl;
++havc;
}while(havc != done);
@ -100,10 +104,11 @@ int main(int, char* argv[])
{
halfedge_around_target_iterator vit, end;
vertex_descriptor vd = target(hd,P);
boost::tie(vit,end) = halfedges_around_target(hd,P);
while(vit!= end) {
halfedge_descriptor hd = *vit;
assert(target(hd,P) == vd);
std::cout << get(CGAL::vertex_point, P, target(hd,P)) << std::endl;
++vit;
}