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

Fixed (duplicate code...) the CGAL_interval_nt operator?=().

This commit is contained in:
Sylvain Pion 1998-10-15 15:36:31 +00:00
parent bfc9ee9ef3
commit 4fd875f2c2
1 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Packages/Interval_arithmetic/include/CGAL/Interval_arithmetic.h
View File

@ -246,6 +246,7 @@ protected:
}; };
class CGAL_Interval_nt : public CGAL_Interval_nt_advanced class CGAL_Interval_nt : public CGAL_Interval_nt_advanced
{ {
friend CGAL_Interval_nt sqrt(const CGAL_Interval_nt&); friend CGAL_Interval_nt sqrt(const CGAL_Interval_nt&);
@ -267,15 +268,16 @@ public:
CGAL_Interval_nt operator-(const CGAL_Interval_nt& d) const ; CGAL_Interval_nt operator-(const CGAL_Interval_nt& d) const ;
CGAL_Interval_nt operator*(const CGAL_Interval_nt& d) const ; CGAL_Interval_nt operator*(const CGAL_Interval_nt& d) const ;
CGAL_Interval_nt operator/(const CGAL_Interval_nt& d) const ; CGAL_Interval_nt operator/(const CGAL_Interval_nt& d) const ;
// The following do not seem to need a redefinition. // These have exactly the same code as the advanced class.
#if 0 // How can I avoid duplicating the code ?
CGAL_Interval_nt& operator+=(const CGAL_Interval_nt& d) ; CGAL_Interval_nt& operator+=(const CGAL_Interval_nt& d) ;
CGAL_Interval_nt& operator-=(const CGAL_Interval_nt& d) ; CGAL_Interval_nt& operator-=(const CGAL_Interval_nt& d) ;
CGAL_Interval_nt& operator*=(const CGAL_Interval_nt& d) ; CGAL_Interval_nt& operator*=(const CGAL_Interval_nt& d) ;
CGAL_Interval_nt& operator/=(const CGAL_Interval_nt& d) ; CGAL_Interval_nt& operator/=(const CGAL_Interval_nt& d) ;
#endif
}; };
// Here we should use the GNU extension of "Named return value"...
// But make benchmarks first, before playing with that.
inline CGAL_Interval_nt CGAL_Interval_nt::operator+(const CGAL_Interval_nt& d) inline CGAL_Interval_nt CGAL_Interval_nt::operator+(const CGAL_Interval_nt& d)
const // return tmp; const // return tmp;
@ -292,7 +294,6 @@ inline CGAL_Interval_nt CGAL_Interval_nt::operator-(const CGAL_Interval_nt& d)
const const
{ {
CGAL_FPU_set_rounding_to_infinity(); CGAL_FPU_set_rounding_to_infinity();
// CGAL_Interval_nt tmp (-(inf + d.sup), sup + d.inf);
CGAL_Interval_nt tmp ( CGAL_Interval_nt_advanced::operator-(d) ); CGAL_Interval_nt tmp ( CGAL_Interval_nt_advanced::operator-(d) );
CGAL_FPU_set_rounding_to_nearest(); CGAL_FPU_set_rounding_to_nearest();
return tmp; return tmp;
@ -302,8 +303,6 @@ inline CGAL_Interval_nt CGAL_Interval_nt::operator*(const CGAL_Interval_nt& d)
const const
{ {
CGAL_FPU_set_rounding_to_infinity(); CGAL_FPU_set_rounding_to_infinity();
// CGAL_Interval_nt tmp = ((CGAL_Interval_nt_advanced) *this)
// * (CGAL_Interval_nt_advanced) d;
CGAL_Interval_nt tmp ( CGAL_Interval_nt_advanced::operator*(d) ); CGAL_Interval_nt tmp ( CGAL_Interval_nt_advanced::operator*(d) );
CGAL_FPU_set_rounding_to_nearest(); CGAL_FPU_set_rounding_to_nearest();
return tmp; return tmp;
@ -313,21 +312,18 @@ inline CGAL_Interval_nt CGAL_Interval_nt::operator/(const CGAL_Interval_nt& d)
const const
{ {
CGAL_FPU_set_rounding_to_infinity(); CGAL_FPU_set_rounding_to_infinity();
// CGAL_Interval_nt tmp = ((CGAL_Interval_nt_advanced) *this)
// / (CGAL_Interval_nt_advanced) d;
CGAL_Interval_nt tmp ( CGAL_Interval_nt_advanced::operator/(d) ); CGAL_Interval_nt tmp ( CGAL_Interval_nt_advanced::operator/(d) );
CGAL_FPU_set_rounding_to_nearest(); CGAL_FPU_set_rounding_to_nearest();
return tmp; return tmp;
} }
#if 0
inline CGAL_Interval_nt& CGAL_Interval_nt::operator+=(const CGAL_Interval_nt& d) inline CGAL_Interval_nt &
CGAL_Interval_nt::operator+=(const CGAL_Interval_nt& d)
{ {
// Stress/Bench test this approach.
// Right now, the test-suite doesn't cover this case.
return *this = *this + d; return *this = *this + d;
/* /* 2 other approaches.
CGAL_FPU_set_rounding_to_infinity(); CGAL_FPU_set_rounding_to_infinity();
// inf += d.inf; sup += d.sup; // inf += d.inf; sup += d.sup;
CGAL_Interval_nt_advanced::operator+=(d); CGAL_Interval_nt_advanced::operator+=(d);
@ -336,35 +332,17 @@ inline CGAL_Interval_nt& CGAL_Interval_nt::operator+=(const CGAL_Interval_nt& d)
*/ */
} }
inline CGAL_Interval_nt& CGAL_Interval_nt::operator-=(const CGAL_Interval_nt& d) inline CGAL_Interval_nt &
{ CGAL_Interval_nt::operator-=(const CGAL_Interval_nt& d)
CGAL_FPU_set_rounding_to_infinity(); { return *this = *this - d; }
// inf += d.sup; sup += d.inf;
CGAL_Interval_nt_advanced::operator-=(d);
CGAL_FPU_set_rounding_to_nearest();
return *this;
}
inline CGAL_Interval_nt& CGAL_Interval_nt::operator*=(const CGAL_Interval_nt& d) inline CGAL_Interval_nt &
{ CGAL_Interval_nt::operator*=(const CGAL_Interval_nt& d)
CGAL_FPU_set_rounding_to_infinity(); { return *this = *this * d; }
// *this = ((CGAL_Interval_nt_advanced) *this)
// * (CGAL_Interval_nt_advanced) d;
CGAL_Interval_nt_advanced::operator*=(d);
CGAL_FPU_set_rounding_to_nearest();
return *this;
}
inline CGAL_Interval_nt& CGAL_Interval_nt::operator/=(const CGAL_Interval_nt& d) inline CGAL_Interval_nt &
{ CGAL_Interval_nt::operator/=(const CGAL_Interval_nt& d)
CGAL_FPU_set_rounding_to_infinity(); { return *this = *this / d; }
// *this = ((CGAL_Interval_nt_advanced) *this)
// / (CGAL_Interval_nt_advanced) d;
CGAL_Interval_nt_advanced::operator/=(d);
CGAL_FPU_set_rounding_to_nearest();
return *this;
}
#endif
inline CGAL_Interval_nt_advanced sqrt(const CGAL_Interval_nt_advanced& d) inline CGAL_Interval_nt_advanced sqrt(const CGAL_Interval_nt_advanced& d)
{ {