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

yet one more change

This commit is contained in:
Menelaos Karavelas 2012-05-21 15:12:22 +00:00
parent 6ca66b18b1
commit c131d174c9
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
View File

@ -801,16 +801,6 @@ protected:
return false; return false;
} }
inline
bool is_hidden(const Edge& e, const Site_2& q, Tag_true) const
{
Vertex_handle v1( e.first->vertex(ccw(e.second)) );
Vertex_handle v2( e.first->vertex( cw(e.second)) );
if ( is_infinite(v1) || is_infinite(v2) ) { return false; }
return geom_traits().is_hidden_2_object()(v1->site(), v2->site(), q);
}
// returns: // returns:
// ON_POSITIVE_SIDE if q is closer to p1 // ON_POSITIVE_SIDE if q is closer to p1
// ON_NEGATIVE_SIDE if q is closer to p2 // ON_NEGATIVE_SIDE if q is closer to p2

9
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
View File

@ -655,9 +655,12 @@ insert(const Site_2& p, Vertex_handle vnear)
e = *ec; e = *ec;
if ( Geom_traits::Is_hidden_2::Has_three_argument_operator ) { if ( Geom_traits::Is_hidden_2::Has_three_argument_operator ) {
if ( is_hidden(e, p, Hidden_predicate_tag()) ) { Vertex_handle v1( e.first->vertex(ccw(e.second)) );
e.first->vertex( ccw(e.second) )->add_hidden_site(p); Vertex_handle v2( e.first->vertex( cw(e.second)) );
e.first->vertex( cw(e.second) )->add_hidden_site(p); if ( !is_infinite(v1) && !is_infinite(v2) &&
is_hidden(v1->site(), v2->site(), p, Hidden_predicate_tag()) ) {
v1->add_hidden_site(p);
v2->add_hidden_site(p);
return Vertex_handle(); return Vertex_handle();
} }
} }