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

Fixed yet again _locate_around_pole

This commit is contained in:
Efi Fogel 2014-09-23 00:16:39 +03:00
parent 16f418a803
commit 95aae645c3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h
View File

@ -806,7 +806,9 @@ _locate_around_pole(Vertex* v,
Arr_parameter_space curr_ps_x = ps_x_op(curr->curve(), curr_end); Arr_parameter_space curr_ps_x = ps_x_op(curr->curve(), curr_end);
Comparison_result curr_res = (ps_x != curr_ps_x) ? Comparison_result curr_res = (ps_x != curr_ps_x) ?
((ps_x == ARR_LEFT_BOUNDARY) ? SMALLER : LARGER) : ((ps_x == ARR_LEFT_BOUNDARY) ? SMALLER :
((ps_x == ARR_RIGHT_BOUNDARY) ? LARGER :
((curr_ps_x == ARR_LEFT_BOUNDARY) ? LARGER : SMALLER))) :
((ps_x != ARR_INTERIOR) ? EQUAL : ((ps_x != ARR_INTERIOR) ? EQUAL :
cmp_x_curve_ends(xc, ind, curr->curve(), curr_end)); cmp_x_curve_ends(xc, ind, curr->curve(), curr_end));
@ -816,12 +818,16 @@ _locate_around_pole(Vertex* v,
Arr_parameter_space next_ps_x = ps_x_op(next->curve(), next_end); Arr_parameter_space next_ps_x = ps_x_op(next->curve(), next_end);
Comparison_result next_res = (ps_x != next_ps_x) ? Comparison_result next_res = (ps_x != next_ps_x) ?
((ps_x == ARR_LEFT_BOUNDARY) ? SMALLER : LARGER) : ((ps_x == ARR_LEFT_BOUNDARY) ? SMALLER :
((ps_x == ARR_RIGHT_BOUNDARY) ? LARGER :
((next_ps_x == ARR_LEFT_BOUNDARY) ? LARGER : SMALLER))) :
((ps_x != ARR_INTERIOR) ? EQUAL : ((ps_x != ARR_INTERIOR) ? EQUAL :
cmp_x_curve_ends(xc, ind, next->curve(), next_end)); cmp_x_curve_ends(xc, ind, next->curve(), next_end));
Comparison_result curr_next_res = (curr_ps_x != next_ps_x) ? Comparison_result curr_next_res = (curr_ps_x != next_ps_x) ?
((curr_ps_x == ARR_LEFT_BOUNDARY) ? SMALLER : LARGER) : ((curr_ps_x == ARR_LEFT_BOUNDARY) ? SMALLER :
((curr_ps_x == ARR_RIGHT_BOUNDARY) ? LARGER :
((next_ps_x == ARR_LEFT_BOUNDARY) ? LARGER : SMALLER))) :
((curr_ps_x != ARR_INTERIOR) ? EQUAL : ((curr_ps_x != ARR_INTERIOR) ? EQUAL :
cmp_x_curve_ends(curr->curve(), curr_end, next->curve(), next_end)); cmp_x_curve_ends(curr->curve(), curr_end, next->curve(), next_end));