diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h index 04504ab87e5..6fa85138678 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h @@ -36,13 +36,14 @@ bool operator==(const Algebraic_1&,const Algebraic_1&); // representation of algebraic numbers class Algebraic_1_rep{ public: - mutable mpfi_t _mpfi; - RS_polynomial_1 *_poly; - int _nr; - int _mult; - mutable Sign _lefteval; + mutable mpfi_t interval; + RS_polynomial_1 *polynomial; + int numroot; + int multiplicity; + mutable Sign lefteval; - Algebraic_1_rep():_poly(NULL),_nr(-1),_mult(-1),_lefteval(ZERO){} + Algebraic_1_rep(): + polynomial(NULL),numroot(-1),multiplicity(-1),lefteval(ZERO){} ~Algebraic_1_rep(){} private: diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h index 2ffaaef22ad..1ca45dde492 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h @@ -26,17 +26,17 @@ namespace CGAL{ inline mpfi_srcptr Algebraic_1::mpfi()const{ - return Ptr()->_mpfi; + return Ptr()->interval; } inline mpfi_ptr Algebraic_1::mpfi(){ - return ptr()->_mpfi; + return ptr()->interval; } inline Gmpfi Algebraic_1::interval()const{ - return Gmpfi(Ptr()->_mpfi); + return Gmpfi(Ptr()->interval); } inline @@ -51,17 +51,17 @@ Gmpfr Algebraic_1::sup()const{ inline const RS_polynomial_1& Algebraic_1::pol()const{ - return *(Ptr()->_poly); + return *(Ptr()->polynomial); } inline int Algebraic_1::nr()const{ - return ptr()->_nr; + return ptr()->numroot; } inline int Algebraic_1::mult()const{ - return ptr()->_mult; + return ptr()->multiplicity; } inline @@ -73,22 +73,22 @@ void Algebraic_1::set_mpfi_ptr(mpfi_srcptr x){ inline void Algebraic_1::clear_pol(){ - ptr()->_poly=NULL; + ptr()->polynomial=NULL; } inline void Algebraic_1::set_pol(const RS_polynomial_1 &p){ - ptr()->_poly=const_cast(&p); + ptr()->polynomial=const_cast(&p); } inline void Algebraic_1::set_nr(int n){ - ptr()->_nr=n; + ptr()->numroot=n; } inline void Algebraic_1::set_mult(int m){ - ptr()->_mult=m; + ptr()->multiplicity=m; } inline @@ -98,7 +98,7 @@ void Algebraic_1::set_prec(mp_prec_t p){ inline void Algebraic_1::set_lefteval(Sign s)const{ - Ptr()->_lefteval=s; + Ptr()->lefteval=s; } inline @@ -118,7 +118,7 @@ mpfr_srcptr Algebraic_1::right()const{ inline Sign Algebraic_1::lefteval()const{ - return ptr()->_lefteval; + return ptr()->lefteval; } inline