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

virtual sign_of_polynomial_at function added and used to gain a speed up if Algebraic_real_rep_bfi inherits from this class.

This commit is contained in:
Sebastian Limbach 2007-06-18 11:07:10 +00:00
parent 350de24ea4
commit ef548d4018
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h
View File

@ -19,6 +19,7 @@
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/Polynomial.h> #include <CGAL/Polynomial.h>
#include <CGAL/Polynomial_traits_d.h>
#include <CGAL/Polynomial/may_have_common_factor.h> #include <CGAL/Polynomial/may_have_common_factor.h>
#include <CGAL/Algebraic_kernel_d/interval_support.h> #include <CGAL/Algebraic_kernel_d/interval_support.h>
//#include <NiX/NT_traits.h> //#include <NiX/NT_traits.h>
@ -79,6 +80,12 @@ private:
is_rational_ = y.is_rational_; is_rational_ = y.is_rational_;
} }
protected:
virtual CGAL::Sign sign_of_polynomial_at( const Field& f ) const {
return polynomial().sign_at( f );
}
protected: protected:
// joins the two lists of related algebraic reals // joins the two lists of related algebraic reals
void introduce(const Algebraic_real_rep& y) const{ void introduce(const Algebraic_real_rep& y) const{
@ -112,18 +119,19 @@ protected:
protected: protected:
void set_implicit_rep(const Poly & P, void set_implicit_rep(const Poly & P,
const Field& LOW, const Field& LOW,
const Field& HIGH) const { const Field& HIGH,
bool use_expensive_sign = false ) const {
CGAL_precondition(LOW < HIGH); CGAL_precondition(LOW < HIGH);
CGAL_precondition(P.sign_at(LOW) != CGAL::ZERO); CGAL_precondition(P.sign_at(LOW) != CGAL::ZERO);
CGAL_precondition(P.sign_at(HIGH) != CGAL::ZERO); CGAL_precondition(P.sign_at(HIGH) != CGAL::ZERO);
CGAL_precondition(P.sign_at(HIGH) != P.sign_at(LOW)); CGAL_precondition(P.sign_at(HIGH) != P.sign_at(LOW));
// TODO: is_square_free not available!! CGAL_precondition_msg(typename CGAL::Polynomial_traits_d< Poly >::Is_square_free()(P), "Polynomial not square-free.");
//CGAL_precondition_msg(is_square_free(P), "Polynomial not square-free.");
polynomial_=P; polynomial_ = P;
low_=LOW; low_=LOW;
high_=HIGH; high_=HIGH;
sign_at_low_=P.sign_at(LOW); sign_at_low_=(use_expensive_sign ? P.sign_at(LOW) : sign_of_polynomial_at(LOW) );
is_rational_=false; is_rational_=false;
// interval_option left out // interval_option left out
@ -173,8 +181,7 @@ public:
CGAL_precondition(P.sign_at(LOW) != CGAL::ZERO); CGAL_precondition(P.sign_at(LOW) != CGAL::ZERO);
CGAL_precondition(P.sign_at(HIGH) != CGAL::ZERO); CGAL_precondition(P.sign_at(HIGH) != CGAL::ZERO);
CGAL_precondition(P.sign_at(HIGH) != P.sign_at(LOW)); CGAL_precondition(P.sign_at(HIGH) != P.sign_at(LOW));
// TODO: Kein is_square_free vorhanden!! CGAL_precondition_msg(typename CGAL::Polynomial_traits_d<Poly>::Is_square_free()(P), "Polynomial not square-free.");
//CGAL_precondition_msg(typename CGAL::Polynomial_traits_d<Poly>::Is_square_free()(P), "Polynomial not square-free.");
set_implicit_rep(P,LOW,HIGH); set_implicit_rep(P,LOW,HIGH);
} }
next=prev=this; next=prev=this;
@ -187,7 +194,7 @@ public:
introduce(y); introduce(y);
} }
//! destructor //! destructor
~Algebraic_real_rep(){ virtual ~Algebraic_real_rep(){
erase_from_list(); erase_from_list();
} }
@ -206,6 +213,7 @@ public:
const Field& low() const {return low_;} const Field& low() const {return low_;}
const Field& high() const {return high_;} const Field& high() const {return high_;}
const Poly& polynomial() const {return polynomial_;} const Poly& polynomial() const {return polynomial_;}
const TRI_BOOL& sign_at_low() const {return sign_at_low_;} const TRI_BOOL& sign_at_low() const {return sign_at_low_;}
/*const std::pair< double, double>& interval() const { /*const std::pair< double, double>& interval() const {
@ -272,7 +280,7 @@ public:
Field m = (low()+high())/Field(2); Field m = (low()+high())/Field(2);
CGAL::simplify(m); CGAL::simplify(m);
CGAL::Sign s = polynomial().sign_at(m); CGAL::Sign s = sign_of_polynomial_at(m);
if ( s == CGAL::ZERO ) learn_from(m); if ( s == CGAL::ZERO ) learn_from(m);
else else
if ( s == sign_at_low() ) low_ = m; if ( s == sign_at_low() ) low_ = m;
@ -296,7 +304,7 @@ public:
if( m <= low() || high() <= m ) return; if( m <= low() || high() <= m ) return;
// now: low < m < high // now: low < m < high
CGAL::Sign s = polynomial().sign_at(m); CGAL::Sign s = sign_of_polynomial_at(m);
if(s == CGAL::ZERO) learn_from(m); if(s == CGAL::ZERO) learn_from(m);
else (s == sign_at_low())? low_ = m : high_=m; else (s == sign_at_low())? low_ = m : high_=m;
} }
@ -316,7 +324,7 @@ public:
// now: low < y < high // now: low < y < high
if(!are_distinct){ if(!are_distinct){
if(polynomial().sign_at(y)==CGAL::ZERO){ if(sign_of_polynomial_at(y)==CGAL::ZERO){
learn_from(y); learn_from(y);
return CGAL::EQUAL ; return CGAL::EQUAL ;
} }
@ -465,7 +473,7 @@ protected:
dummy1.prev=current; dummy1.prev=current;
current->set_implicit_rep(pfactor1, current->set_implicit_rep(pfactor1,
current->low(), current->low(),
current->high()); current->high(), true );
}else{ }else{
current->next=&dummy2; current->next=&dummy2;
current->prev=dummy2.prev; current->prev=dummy2.prev;
@ -473,7 +481,7 @@ protected:
dummy2.prev=current; dummy2.prev=current;
current->set_implicit_rep(pfactor2, current->set_implicit_rep(pfactor2,
current->low(), current->low(),
current->high()); current->high(), true );
} }
if(current==last) break; if(current==last) break;