diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h index ce5d9fba2ed..b87f8b993f8 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1.h @@ -40,12 +40,9 @@ public: RS_polynomial_1 *_poly; int _nr; int _mult; - mpfi_ptr _prev,_next; mutable Sign _lefteval; - Algebraic_1_rep(): - _poly(NULL),_nr(-1),_mult(-1), - _prev(NULL),_next(NULL),_lefteval(ZERO){} + Algebraic_1_rep():_poly(NULL),_nr(-1),_mult(-1),_lefteval(ZERO){} ~Algebraic_1_rep(){} private: @@ -80,17 +77,16 @@ public: Algebraic_1(mpfi_srcptr, const RS_polynomial_1&, int, - int, - mpfi_ptr, - mpfi_ptr); + int + //,mpfi_ptr,mpfi_ptr + ); // the another interesting variant Algebraic_1(mpfi_srcptr, const RS_polynomial_1&, int, int, - mpfi_ptr, - mpfi_ptr, + //mpfi_ptr,mpfi_ptr, CGAL::Sign); // functions related to the member data @@ -109,12 +105,8 @@ public: void set_nr(int); void set_mult(int); void set_prec(mp_prec_t); - void set_prev(mpfi_ptr); - void set_next(mpfi_ptr); void set_lefteval(Sign)const; mp_prec_t get_prec()const; - mpfi_ptr prev()const; - mpfi_ptr next()const; Sign lefteval()const; mpfr_srcptr left()const; mpfr_srcptr right()const; diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h index c7cffd20372..e67b5d364aa 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_constructors.h @@ -35,8 +35,6 @@ Algebraic_1::Algebraic_1(const Algebraic_1 &i,mpfr_prec_t pl,mpfr_prec_t pr){ set_pol(i.pol()); set_nr(i.nr()); set_mult(i.mult()); - set_prev(i.prev()); - set_next(i.next()); set_lefteval(i.lefteval()); } @@ -200,16 +198,12 @@ Algebraic_1::Algebraic_1( mpfi_srcptr i, const RS_polynomial_1 &p, int n, - int m, - mpfi_ptr prevroot, - mpfi_ptr nextroot){ + int m){ mpfi_init(mpfi()); set_mpfi_ptr(i); set_pol(p); set_nr(n); set_mult(m); - set_prev(prevroot); - set_next(nextroot); // we don't evaluate in the sf part of p, since p is sf // TODO: add assertion set_lefteval(RSSign::signat(p,&i->left)); @@ -219,14 +213,12 @@ Algebraic_1::Algebraic_1( // left evaluation inline Algebraic_1::Algebraic_1(mpfi_srcptr i,const RS_polynomial_1 &p,int n,int m, - mpfi_ptr prevroot,mpfi_ptr nextroot,CGAL::Sign s){ + CGAL::Sign s){ mpfi_init(mpfi()); set_mpfi_ptr(i); set_pol(p); set_nr(n); set_mult(m); - set_prev(prevroot); - set_next(nextroot); set_lefteval(s); } 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 66d36fa6d0d..3a3cc247f83 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_member.h @@ -96,16 +96,6 @@ void Algebraic_1::set_prec(mp_prec_t p){ mpfi_round_prec(mpfi(),p); } -inline -void Algebraic_1::set_prev(mpfi_ptr p){ - ptr()->_prev=p; -} - -inline -void Algebraic_1::set_next(mpfi_ptr n){ - ptr()->_next=n; -} - inline void Algebraic_1::set_lefteval(Sign s)const{ Ptr()->_lefteval=s; @@ -126,16 +116,6 @@ mpfr_srcptr Algebraic_1::right()const{ return &(mpfi()->right); } -inline -mpfi_ptr Algebraic_1::prev()const{ - return ptr()->_prev; -} - -inline -mpfi_ptr Algebraic_1::next()const{ - return ptr()->_next; -} - inline Sign Algebraic_1::lefteval()const{ return ptr()->_lefteval; diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h index e8fd3c65ae6..43877d693dc 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_operators.h @@ -35,8 +35,6 @@ Algebraic_1 Algebraic_1::operator-()const{ pol().minusx(), nr(), mult(), - NULL, - NULL, -lefteval()); return *inverse; } diff --git a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h index 248b0bdb4ac..d2fca5b2eac 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h +++ b/Algebraic_kernel_d/include/CGAL/RS/algebraic_1_other.h @@ -97,8 +97,8 @@ std::istream& operator>>(std::istream &is,Algebraic_1 &a){ *(new RS_polynomial_1(pol)), // polynomial nr, // number of root mult, // multiplicity - (mpfi_ptr)NULL, // previous root - (mpfi_ptr)NULL, // next root + //(mpfi_ptr)NULL, // previous root + //(mpfi_ptr)NULL, // next root (CGAL::Sign)eval);// evaluation on the left bound goto is_ret; is_fail_ret: diff --git a/Algebraic_kernel_d/include/CGAL/RS/functors_1.h b/Algebraic_kernel_d/include/CGAL/RS/functors_1.h index 6ecc803a648..f94615bfce9 100644 --- a/Algebraic_kernel_d/include/CGAL/RS/functors_1.h +++ b/Algebraic_kernel_d/include/CGAL/RS/functors_1.h @@ -162,9 +162,10 @@ struct Solve_RS_1{ } } for(int i=0;ileft,l.fr(),GMP_RNDD); mpfr_set(&i->right,u.fr(),GMP_RNDU); - return Algebraic(i,convert()(p),0,0,NULL,NULL); + return Algebraic(i,convert()(p),0,0 + //,NULL,NULL + ); } }; // Construct_alg_1