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

renaming outer_ccb to ccb as documented. 

outer_ccb is however kept in the code for backward compatibility
This commit is contained in:
Sébastien Loriot 2012-12-20 12:58:28 +01:00
parent eb11ded35e
commit acb43cdbf2
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h
View File

@ -244,7 +244,7 @@ class Virtual_Voronoi_diagram_base_2
#endif #endif
if ( Face_handle* f = boost::get<Face_handle>(lrp) ) { if ( Face_handle* f = boost::get<Face_handle>(lrp) ) {
Ccb_halfedge_circulator ccb_start = (*f)->outer_ccb(); Ccb_halfedge_circulator ccb_start = (*f)->ccb();
Ccb_halfedge_circulator ccb = ccb_start; Ccb_halfedge_circulator ccb = ccb_start;
do { do {
draw_edge(*ccb, widget); draw_edge(*ccb, widget);

2
Voronoi_diagram_2/examples/Voronoi_diagram_2/vd_2_point_location.cpp
View File

@ -74,7 +74,7 @@ int main()
std::cout << "face." << std::endl; std::cout << "face." << std::endl;
std::cout << "The vertices of the Voronoi face are" std::cout << "The vertices of the Voronoi face are"
<< " (in counterclockwise order):" << std::endl; << " (in counterclockwise order):" << std::endl;
Ccb_halfedge_circulator ec_start = (*f)->outer_ccb(); Ccb_halfedge_circulator ec_start = (*f)->ccb();
Ccb_halfedge_circulator ec = ec_start; Ccb_halfedge_circulator ec = ec_start;
do { do {
print_endpoint(ec, false); print_endpoint(ec, false);

7
Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h
View File

@ -112,10 +112,11 @@ class Face
); );
} }
Ccb_halfedge_circulator outer_ccb() const { Ccb_halfedge_circulator ccb() const {
return Ccb_halfedge_circulator( *halfedge() ); return Ccb_halfedge_circulator( *halfedge() );
} }
Ccb_halfedge_circulator outer_ccb() const { return ccb(); }
// PREDICATES // PREDICATES
//----------- //-----------
bool is_unbounded() const { bool is_unbounded() const {
@ -131,7 +132,7 @@ class Face
} }
bool is_halfedge_on_ccb(const Halfedge_handle& he) const { bool is_halfedge_on_ccb(const Halfedge_handle& he) const {
Ccb_halfedge_circulator hc_start = outer_ccb(); Ccb_halfedge_circulator hc_start = ccb();
Ccb_halfedge_circulator hc = hc_start; Ccb_halfedge_circulator hc = hc_start;
do { do {
if ( he == *hc ) { return true; } if ( he == *hc ) { return true; }
@ -155,7 +156,7 @@ class Face
valid = valid && !vda_->edge_rejector()(vda_->dual(), halfedge()->dual()); valid = valid && !vda_->edge_rejector()(vda_->dual(), halfedge()->dual());
Ccb_halfedge_circulator hc = outer_ccb(); Ccb_halfedge_circulator hc = ccb();
Ccb_halfedge_circulator hc_start = hc; Ccb_halfedge_circulator hc_start = hc;
Face_handle f_this(*this); Face_handle f_this(*this);
do { do {

2
Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h
View File

@ -53,7 +53,7 @@ void test_vd_face_concept(const typename VDA::Face_handle& f, int dim)
Halfedge_handle e = f->halfedge(); Halfedge_handle e = f->halfedge();
CGAL_assertion( e->face() == f ); CGAL_assertion( e->face() == f );
CCBHC hc_start = f->outer_ccb(); CCBHC hc_start = f->ccb();
CCBHC hc = hc_start; CCBHC hc = hc_start;
test_circulator(hc); test_circulator(hc);