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

Merge: 

| ------------------------------------------------------------------------
  | r58141 | lrineau | 2010-08-18 15:08:04 +0200 (Wed, 18 Aug 2010) | 5 lines
  | Changed paths:
  |    M /branches/CGAL-3.7-branch/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h
  |    M /branches/CGAL-3.7-branch/Number_types/include/CGAL/CORE_BigFloat.h
  | 
  | Fix the "bug" of CORE-1.7 in 64 bits. The bug was actually in CGAL
  | Number_types and Algebraic_kernel_d! The basis of CORE::BigFloat is not
  | 2^14: it is 2^CORE::CHUNK_BIT. CORE::CHUNK_BIT is 14 in 32 bits, but *30*
  | in 64 bits!
  | 
  | ------------------------------------------------------------------------

Update: See revision 58145. 
  -- Laurent Rineau Wed Aug 18 16:26:15 CEST 2010
This commit is contained in:
Laurent Rineau 2010-08-18 13:48:03 +00:00
parent 26e4e3ae68
commit 1ca243eaa3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h
View File

@ -106,7 +106,7 @@ public:
struct Get_exponent
: public std::unary_function< CORE::BigFloat, long > {
long operator()( const CORE::BigFloat& x ) const {
return 14*x.exp(); // The basis is 8092
return CORE::CHUNK_BIT*x.exp(); // The basis is 2^CORE::CHUNK_BIT
}
};

14
Number_types/include/CGAL/CORE_BigFloat.h
View File

@ -191,7 +191,7 @@ public:
long shift = ::CORE::bitLength(err.m()) - digits_long + 1 ;
//std::cout << "shift " << shift<< std::endl;
long new_err = ((err.m()+err.err()) >> shift).longValue()+1;
err = CORE::BigFloat(0,new_err,0) * CORE::BigFloat::exp2(err.exp()*14+shift);
err = CORE::BigFloat(0,new_err,0) * CORE::BigFloat::exp2(err.exp()*CORE::CHUNK_BIT+shift);
}else{
err = CORE::BigFloat(0,err.m().longValue()+err.err(),err.exp());
}
@ -203,8 +203,8 @@ public:
if(mid.exp() > err.exp()) {
long mid_err = mid.err();
CORE::BigInt mid_m = mid.m();
mid_err = mid_err << (mid.exp()-err.exp())*14;
mid_m = mid_m << (mid.exp()-err.exp())*14;
mid_err = mid_err << (mid.exp()-err.exp())*CORE::CHUNK_BIT;
mid_m = mid_m << (mid.exp()-err.exp())*CORE::CHUNK_BIT;
mid = CORE::BigFloat(mid_m,mid_err,err.exp());
//print_bf(mid,"corr_mid");
}
@ -273,7 +273,7 @@ round(const CORE::BigFloat& x, long rel_prec = CORE::defRelPrec.toLong() ){
long exp = x.exp();
// std::cout <<"(" << m << "+-" <<err << ")*2^"<<(14*exp) << std::endl;
// std::cout <<"(" << m << "+-" <<err << ")*2^"<<(CORE::CHUNK_BIT*exp) << std::endl;
// if (err != 0)
// std::cout <<"current prec: " << CGAL::relative_precision(x) << std::endl;
// else
@ -291,12 +291,12 @@ round(const CORE::BigFloat& x, long rel_prec = CORE::defRelPrec.toLong() ){
if( shift > 0 ){
m >>= shift ;
err >>= shift;
xr = BF(m,err+1,0)*BF::exp2(exp*14+shift);
xr = BF(m,err+1,0)*BF::exp2(exp*CORE::CHUNK_BIT+shift);
}else{ // noting to do
xr = x;
}
// std::cout <<"(" <<m << "+-" <<err+1 << ")*2^"<<(14*exp) << std::endl;
// std::cout <<"(" <<m << "+-" <<err+1 << ")*2^"<<(CORE::CHUNK_BIT*exp) << std::endl;
// if (xr.err() != 0)
// std::cout <<"current prec: " << CGAL::relative_precision(xr) << std::endl;
// else
@ -335,7 +335,7 @@ public:
NT w = Width()(x);
w /= ::CORE::BigFloat(x.m()-x.err(),0,x.exp());
w = w.abs();
return -(CORE::ceilLg(w.m()+w.err())+w.exp()*14);
return -(CORE::ceilLg(w.m()+w.err())+w.exp()*CORE::CHUNK_BIT);
}
};