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

correct but in Bezier_x_monotone::point_poisition in the case 

the bezier is a vertical or horizontal segment.
This fix showed a probable bug in expected result of the testsuite:
 In the case the bezier is a vertical segment,
 compare_y_at_x now returns EQUAL when the query point
 is inside the segment.
This commit is contained in:
Sébastien Loriot 2011-02-09 17:38:10 +00:00
parent ab9f2347ba
commit fe14f0c121
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h
View File

@ -714,15 +714,39 @@ _Bezier_x_monotone_2<RatKer, AlgKer, NtTrt, BndTrt>::point_position
(const Point_2& p,
Bezier_cache& cache) const
{
Nt_traits nt_traits;
//First check if the bezier is a vertical segment
if (nt_traits.degree(_curve.x_polynomial()) <= 0)
{
// In this case both points must be exact.
CGAL_assertion (p.is_exact() && _ps.is_exact() && _pt.is_exact());
if (p.is_rational() && _ps.is_rational() && _pt.is_rational())
{
const Rat_point_2& rat_p = (Rat_point_2) p;
const Rat_point_2& rat_ps = (Rat_point_2) _ps;
const Rat_point_2& rat_pt = (Rat_point_2) _pt;
Comparison_result res1 = (CGAL::compare (rat_p.y(), rat_ps.y()));
Comparison_result res2 = (CGAL::compare (rat_p.y(), rat_pt.y()));
return (res1==res2 ? res1:EQUAL);
}
Comparison_result res1 = (CGAL::compare (p.y(), _ps.y()));
Comparison_result res2 = (CGAL::compare (p.y(), _pt.y()));
return (res1==res2 ? res1:EQUAL);
}
if (p.identical(_ps)) {
return EQUAL;
}
// First check whether p has the same x-coordinate as one of the endpoints.
const Comparison_result res1 = p.compare_x (_ps, cache);
// Then check whether the bezier is an horizontal segment or
// if p has the same x-coordinate as one of the endpoint
const Comparison_result res1 = p.compare_x (_ps, cache);
if (res1 == EQUAL)
if (res1 == EQUAL || nt_traits.degree(_curve.y_polynomial()) <= 0)
{
// In this case both points must be exact.
CGAL_assertion (p.is_exact() && _ps.is_exact());
@ -913,8 +937,7 @@ _Bezier_x_monotone_2<RatKer, AlgKer, NtTrt, BndTrt>::point_position
if ( p.is_rational() ){
Nt_traits nt_traits;
Rational px = ((Rat_point_2) p).x();
const Rational& px = ((Rat_point_2) p).x();
Integer denom_px=nt_traits.denominator(px);
Integer numer_px=nt_traits.numerator(px);

12
Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/bezier/compare_y_at_x
View File

@ -1,10 +1,10 @@
compare_y_at_x 0 0 EQUAL
compare_y_at_x 1 0 LARGER
compare_y_at_x 2 0 LARGER
compare_y_at_x 3 0 LARGER
compare_y_at_x 4 0 LARGER
compare_y_at_x 5 0 LARGER
compare_y_at_x 6 0 LARGER
compare_y_at_x 1 0 EQUAL
compare_y_at_x 2 0 EQUAL
compare_y_at_x 3 0 EQUAL
compare_y_at_x 4 0 EQUAL
compare_y_at_x 5 0 EQUAL
compare_y_at_x 6 0 EQUAL
#
compare_y_at_x 7 1 SMALLER
compare_y_at_x 8 1 EQUAL