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

some problem with Coerction traits: Explicit casts required 

Needs some further investigation! Background: the new CMake scripts for CGAL
are more strict what comes to includes of external libs (and Core is 
considered as an external lib now), thus the testsuite has shown errors 
related to the 'hacks' here. But as far as I know, the Coercion_traits 
should be able to solve these issues.
This commit is contained in:
Eric Berberich 2012-06-29 16:03:33 +00:00
parent 3a7ad3baaa
commit 810209f613
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Envelope_3/include/CGAL/Env_sphere_traits_3.h
View File

@ -481,13 +481,17 @@ public:
return o; return o;
} }
// EBEB 2012/06/29: Added because of
// no matching function for call to 'compare(CGAL::Env_sphere_traits_3<Conic_traits_2>::Rational&, int)
Rational zero(0);
// if (a1==a2) and (b1==b2) (*) is a plane parallel to the xy-plane // if (a1==a2) and (b1==b2) (*) is a plane parallel to the xy-plane
// and either all ellipse (which should be a circle) is the // and either all ellipse (which should be a circle) is the
// intersection - in which case lc >= 0 // intersection - in which case lc >= 0
// or there is no intersection at all between the 2 half spheres - // or there is no intersection at all between the 2 half spheres -
// in which case lc < 0 // in which case lc < 0
if (CGAL_NTS compare(a_diff, 0) == EQUAL && if (CGAL_NTS compare(a_diff, zero) == EQUAL &&
CGAL_NTS compare(b_diff, 0) == EQUAL) CGAL_NTS compare(b_diff, zero) == EQUAL)
{ {
Sign sign_lc = CGAL_NTS sign(lc); Sign sign_lc = CGAL_NTS sign(lc);
if (sign_lc != NEGATIVE) if (sign_lc != NEGATIVE)
@ -505,7 +509,7 @@ public:
// R*x^2 + S*y^2 + T*xy + U*x + V*y + W = 0 // R*x^2 + S*y^2 + T*xy + U*x + V*y + W = 0
Alg_point_2 source, target, pmid; Alg_point_2 source, target, pmid;
int n_inter_points; int n_inter_points;
if (CGAL_NTS compare(lb, 0) != EQUAL) if (CGAL_NTS compare(lb, zero) != EQUAL)
{ {
// Find the x-coordinates of the intersection points of the conic // Find the x-coordinates of the intersection points of the conic
// curve and the line y = -(la*x + lc) / lb: // curve and the line y = -(la*x + lc) / lb:
@ -550,24 +554,23 @@ public:
CGAL_precondition(x_mid_n_y_points > 0); CGAL_precondition(x_mid_n_y_points > 0);
Algebraic y1 = x_mid_y_points[0].y(), y2 = x_mid_y_points[1].y(); Algebraic y1 = x_mid_y_points[0].y(), y2 = x_mid_y_points[1].y();
if (CGAL_NTS compare ( if (CGAL_NTS compare(Algebraic(la)*x_mid + Algebraic(lb)*y1 + Algebraic(lc),
Algebraic(la)*x_mid + Algebraic(lb)*y1 + Algebraic(lc), Algebraic(0)
0) == LARGER) ) == LARGER)
{ {
pmid = Alg_point_2(x_mid, y1); pmid = Alg_point_2(x_mid, y1);
} }
else else
{ {
CGAL_assertion(CGAL_NTS compare CGAL_assertion(CGAL_NTS compare(Algebraic(la)*x_mid + Algebraic(lb)*y2 + Algebraic(lc),
(Algebraic(la)*x_mid + Algebraic(lb)*y2 + Algebraic(lc), Algebraic(0)) == LARGER);
0) == LARGER);
pmid = Alg_point_2(x_mid, y2); pmid = Alg_point_2(x_mid, y2);
} }
} }
} }
else else
{ // lb == 0 { // lb == 0
CGAL_assertion(CGAL_NTS compare(la, 0) != EQUAL); CGAL_assertion(CGAL_NTS compare(la, zero) != EQUAL);
// Find the intersection of the vertical line x = -lc / la: // Find the intersection of the vertical line x = -lc / la:
Rational inter_x = -lc/la; Rational inter_x = -lc/la;
@ -610,7 +613,7 @@ public:
Algebraic x1 = y_mid_x_points[0].x(), x2 = y_mid_x_points[1].x(); Algebraic x1 = y_mid_x_points[0].x(), x2 = y_mid_x_points[1].x();
if (CGAL_NTS compare( if (CGAL_NTS compare(
Algebraic(la)*x1 + Algebraic(lb)*y_mid + Algebraic(lc), Algebraic(la)*x1 + Algebraic(lb)*y_mid + Algebraic(lc),
0) == LARGER) Algebraic(0)) == LARGER)
{ {
pmid = Alg_point_2(x1, y_mid); pmid = Alg_point_2(x1, y_mid);
} }
@ -618,8 +621,8 @@ public:
{ {
CGAL_assertion(CGAL_NTS compare ( CGAL_assertion(CGAL_NTS compare (
Algebraic(la)*x2 + Algebraic(lb)*y_mid + Algebraic(lc), Algebraic(la)*x2 + Algebraic(lb)*y_mid + Algebraic(lc),
0) == LARGER); Algebraic(0)) == LARGER);
pmid = Alg_point_2(x2, y_mid); pmid = Alg_point_2(x2, Algebraic(y_mid));
} }
} }
} }