From d590c9e0116a37f09eb0e4b556014dea199e29ae Mon Sep 17 00:00:00 2001 From: Ralf Schindlbeck Date: Thu, 14 Feb 2008 09:42:23 +0000 Subject: [PATCH] Modified, due to porting of interval_support from EXACUS2CGAL. The new interval_support is now in the Number_types package. --- .../CGAL/Algebraic_curve_kernel_2/Xy_coordinate_2.h | 6 +++--- .../CGAL/Algebraic_kernel_d/Algebraic_real_rep.h | 3 ++- .../Bitstream_descartes_rndl_tree_traits.h | 3 ++- .../Algebraic_kernel_d/Real_embeddable_extension.h | 8 +++++--- .../include/CGAL/Algebraic_kernel_d/interval_support.h | 10 ++++++++-- .../CGAL/Algebraic_kernel_d/leda_interval_support.h | 7 +++++-- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Xy_coordinate_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Xy_coordinate_2.h index 51094c1ef56..35599717b21 100755 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Xy_coordinate_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Xy_coordinate_2.h @@ -596,18 +596,18 @@ public: } long final_prec = set_precision(BF(),get_precision(BF())+4); - BFI bfi = CGALi::hull(convert_to_bfi(lower(*this)), + BFI bfi = CGAL::hull(convert_to_bfi(lower(*this)), convert_to_bfi(upper(*this))); while( !singleton(bfi) && get_significant_bits(bfi) < final_prec ){ refine(*this); - bfi = CGALi::hull( + bfi = CGAL::hull( convert_to_bfi(lower(*this)), convert_to_bfi(upper(*this))); } double_y - = CGAL::to_double((CGALi::lower(bfi)+ CGALi::upper(bfi)) / 2); + = CGAL::to_double((CGAL::lower(bfi)+ CGAL::upper(bfi)) / 2); } set_precision(BF(),old_prec); return std::make_pair(double_x, double_y); diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h index f420ecd09ed..b31848c61b7 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h @@ -21,7 +21,8 @@ #include #include #include -#include +// #include +#include //#include //#include diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h index bc7e4103dd3..43baa1ebdbe 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h @@ -25,7 +25,8 @@ #include #include -#include +// #include +#include #include #include diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h index f51280cbc04..072824e14e4 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h @@ -22,13 +22,15 @@ #ifdef CGAL_USE_LEDA #include -#include +// #include +#include #endif #ifdef CGAL_USE_CORE -#include +// #include +#include #endif @@ -210,7 +212,7 @@ namespace CGALi { struct Floor_log2_abs : public Unary_function< CORE::BigFloat, long > { long operator()( CORE::BigFloat x ) const { - CGAL_precondition(!CGALi::in_zero(x)); + CGAL_precondition(!CGAL::in_zero(x)); x = CGAL::abs(x); return CORE::floorLg(x.m()-x.err())+x.exp()*14; } diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/interval_support.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/interval_support.h index 6250f57645f..ae71540bd73 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/interval_support.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/interval_support.h @@ -22,6 +22,8 @@ #ifndef CGAL_ALGEBRAIC_KERNEL_D_INTERVAL_SUPPORT_H #define CGAL_ALGEBRAIC_KERNEL_D_INTERVAL_SUPPORT_H +#if 0 + // TODO: Remove #define (also from Arithmetic_kernel.h) if Algebraic_kernel_d is // part of the release #ifndef CGAL_INTERN_USE_BFI @@ -34,11 +36,13 @@ #include #ifdef CGAL_USE_LEDA -#include +// #include +#include #endif // LiS_HAVE_LEDA #ifdef CGAL_USE_CORE -#include +// #include +#include #endif // LiS_HAVE_LEDA @@ -95,4 +99,6 @@ convert_to_bfi(const Algebraic_real_pure< COEFF, RAT, POLICY, REPCLASS >& x){ CGAL_END_NAMESPACE +#endif + #endif // NiX_INTERVAL_SUPPORT_H diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/leda_interval_support.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/leda_interval_support.h index a91ca5c3b1a..079e764d69b 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/leda_interval_support.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/leda_interval_support.h @@ -20,6 +20,8 @@ #ifndef CGAL_ALGEBRAIC_KERNEL_D_LEDA_INTERVAL_SUPPORT_H #define CGAL_ALGEBRAIC_KERNEL_D_LEDA_INTERVAL_SUPPORT_H +#if 0 + #include #include #include @@ -115,7 +117,7 @@ namespace interval_lib{ }; }//namespace interval_lib - +/* inline std::ostream& operator << (std::ostream& os, const boost::numeric::interval& x) @@ -126,7 +128,7 @@ std::ostream& operator << << x.upper().get_significant() << "*2^" << x.upper().get_exponent() << "]"; return os; -} +}*/ }//namespace numeric }//namespace boost @@ -296,5 +298,6 @@ std::pair to_interval( const CGALi::leda_bigfloat_interval& x ) CGAL_END_NAMESPACE +#endif #endif // CGAL_ALGEBRAIC_KERNEL_D_LEDA_INTERVAL_SUPPORT_H