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

minor changes 

ternary operator ? is changed into if-else
Line 887 in Finite edge conflict
assertions of horizontal and vertical segment is added
in Line 1050 in Basic predicate
This commit is contained in:
Sandeep Kumar Dey 2012-09-29 11:25:41 +02:00 committed by Panagiotis Cheilaris
parent 01fd99ae5e
commit 377a8895c5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/CGAL/Segment_Delaunay_graph_Linf_2/Basic_predicates_C2.h
View File

@ -1047,6 +1047,8 @@ public:
{
CGAL_assertion( t.is_segment() );
CGAL_assertion( s.is_segment() );
CGAL_assertion(not s.segment().is_horizontal()
and not s.segment().is_vertical());
//need to add assertion for s not hor and not ver
//and (not s.is_horizontal())
//and (not s.is_vertical()) );

14
include/CGAL/Segment_Delaunay_graph_Linf_2/Finite_edge_interior_conflict_C2.h
View File

@ -883,10 +883,16 @@ public:
//intersects_segment_interior_inf_wedge_sp
// then return false
if (t.is_segment()) {
if(p.is_point() ? intersects_segment_interior_inf_wedge_sp(q,p,t)
: intersects_segment_interior_inf_wedge_sp(p,q,t)
== false)
return false;
bool result;
if(p.is_point()) {
result = intersects_segment_interior_inf_wedge_sp(q,p,t);
} else {
result = intersects_segment_interior_inf_wedge_sp(p,q,t);
}
if (result == false) {
return false;
}
}
// philaris: tocheck
std::cout << "debug finite-edge-int-cf tocheck (p,q,r,t,sgn)= ("