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

fix problems with leda real

This commit is contained in:
Michael Hemmer 2012-07-08 12:05:05 +00:00
parent f87bbe2479
commit 2ebc7d78c5
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Algebraic_point_2.h
View File

@ -195,8 +195,13 @@ public:
typename BFI_traits::Set_precision set_precision; typename BFI_traits::Set_precision set_precision;
typename BFI_polynomial_traits::Evaluate evaluate; typename BFI_polynomial_traits::Evaluate evaluate;
typedef typename BFI_traits::Bound BFIBound;
typename CGAL::Coercion_traits<Bound,BFIBound>::Cast to_bound;
long precision = 16; long precision = 16;
Rational error_bound = CGAL::ipower(Rational(1,2),r); Bound error_bound = CGAL::ipower(Bound(1)/2,r);
while (true) while (true)
{ {
set_precision(precision); set_precision(precision);
@ -213,11 +218,13 @@ public:
if (CGAL::zero_in(y_denom_bfi) == false) if (CGAL::zero_in(y_denom_bfi) == false)
{ {
BFI y_bfi(y_numer_bfi/y_denom_bfi); BFI y_bfi(y_numer_bfi/y_denom_bfi);
if (CGAL::compare(CGAL::width(y_bfi), if (CGAL::compare(CGAL::width(y_bfi),
Rational(CGAL::lower(CGAL::abs(y_bfi))) * error_bound ) to_bound(CGAL::lower(CGAL::abs(y_bfi))) * error_bound )
== SMALLER) == SMALLER)
return std::make_pair(Bound(CGAL::lower(y_bfi)), return std::make_pair(
Bound(CGAL::upper(y_bfi))); to_bound(CGAL::lower(y_bfi)),
to_bound(CGAL::upper(y_bfi)));
} }
else precision*=2; else precision*=2;
} }
@ -258,7 +265,11 @@ private:
{ {
typename BFI_traits::Set_precision set_precision; typename BFI_traits::Set_precision set_precision;
typename BFI_polynomial_traits::Evaluate evaluate; typename BFI_polynomial_traits::Evaluate evaluate;
Rational error_bound = CGAL::ipower(Rational(1,2),a);
typedef typename BFI_traits::Bound BFIBound;
typename CGAL::Coercion_traits<Bound,BFIBound>::Cast to_bound;
Bound error_bound = CGAL::ipower(Bound(1)/2,a);
while (true) while (true)
{ {
set_precision(precision); set_precision(precision);
@ -273,9 +284,9 @@ private:
if (CGAL::zero_in(y_denom_bfi) == false) if (CGAL::zero_in(y_denom_bfi) == false)
{ {
BFI y_bfi(y_numer_bfi/y_denom_bfi); BFI y_bfi(y_numer_bfi/y_denom_bfi);
if (Bound(CGAL::width(y_bfi)) < error_bound ) if (to_bound(CGAL::width(y_bfi)) < error_bound )
return std::make_pair(Bound(CGAL::lower(y_bfi)), return std::make_pair(to_bound(CGAL::lower(y_bfi)),
Bound(CGAL::upper(y_bfi)) ); to_bound(CGAL::upper(y_bfi)) );
} }
else precision*=2; else precision*=2;
} }