From 1d6de3a24313037a01fe5ec2a1ad1dbf7fe711db Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Wed, 12 Jul 2006 11:40:00 +0000 Subject: [PATCH] Remove Fixed_precision_nt --- Installation/CHANGES | 4 ++++ Maintenance/release_building/include_in_release | 1 - Number_types/doc_tex/NumberTypeSupport/Numbertype.tex | 5 ----- .../doc_tex/NumberTypeSupport_ref/FieldNumberType.tex | 1 - .../doc_tex/NumberTypeSupport_ref/RingNumberType.tex | 1 - Number_types/doc_tex/NumberTypeSupport_ref/intro.tex | 1 - Number_types/doc_tex/NumberTypeSupport_ref/main.tex | 5 ----- Number_types/include/CGAL/FPU.h | 6 ++---- Number_types/include/CGAL/number_type_basic.h | 9 --------- Number_types/test/Number_types/utilities.C | 2 -- 10 files changed, 6 insertions(+), 29 deletions(-) diff --git a/Installation/CHANGES b/Installation/CHANGES index b0e32cad032..622eae09c8a 100644 --- a/Installation/CHANGES +++ b/Installation/CHANGES @@ -1,5 +1,9 @@ $CGAL/CHANGES +----------------------------- Release 3.3 ---------------------------------- + +- Fixed_precision_nt and Filtered_exact number types removed. + ----------------------------- Release 3.2 ---------------------------------- The following functionality has been added or changed: diff --git a/Maintenance/release_building/include_in_release b/Maintenance/release_building/include_in_release index d5dd2cc4f6d..47c311a0d5a 100644 --- a/Maintenance/release_building/include_in_release +++ b/Maintenance/release_building/include_in_release @@ -17,7 +17,6 @@ Curved_kernel Developers_manual Distance_2 Distance_3 -Fixed_precision_nt Generator Geomview HalfedgeDS diff --git a/Number_types/doc_tex/NumberTypeSupport/Numbertype.tex b/Number_types/doc_tex/NumberTypeSupport/Numbertype.tex index b1ddceddd9e..b5f765f4725 100644 --- a/Number_types/doc_tex/NumberTypeSupport/Numbertype.tex +++ b/Number_types/doc_tex/NumberTypeSupport/Numbertype.tex @@ -111,11 +111,6 @@ number that \ccc{NT} is able to represent, but because it first tries to use an approximate value to perform computations it can be faster than the provided number type \ccc{NT}. \cgal\ also provides a fixed-precision number type, -\ccc{Fixed_precision_nt} is a number type that provides 24-bit numbers in fixed point -representation. This number type provides some specialized predicates -that are exact and efficient for numbers known to be representable using -24 bits. - A number type for doing interval arithmetic, \ccc{Interval_nt}, is provided. This number type helps in doing filtering of predicates. diff --git a/Number_types/doc_tex/NumberTypeSupport_ref/FieldNumberType.tex b/Number_types/doc_tex/NumberTypeSupport_ref/FieldNumberType.tex index eb1816648cc..47f086c0ade 100644 --- a/Number_types/doc_tex/NumberTypeSupport_ref/FieldNumberType.tex +++ b/Number_types/doc_tex/NumberTypeSupport_ref/FieldNumberType.tex @@ -30,7 +30,6 @@ RingNumberType \ccc{float} \\ \ccc{double} \\ \ccc{CGAL::Filtered_exact} \\ -\ccc{CGAL::Fixed_precision_nt} \\ \ccc{CGAL::Gmpq} \\ \ccc{CGAL::Interval_nt} \\ \ccc{CGAL::Interval_nt_advanced} \\ diff --git a/Number_types/doc_tex/NumberTypeSupport_ref/RingNumberType.tex b/Number_types/doc_tex/NumberTypeSupport_ref/RingNumberType.tex index d902027ee93..221d0452e38 100644 --- a/Number_types/doc_tex/NumberTypeSupport_ref/RingNumberType.tex +++ b/Number_types/doc_tex/NumberTypeSupport_ref/RingNumberType.tex @@ -146,7 +146,6 @@ have as a precondition that all numerical values are valid.} \CC\ built-in number types \\ \ccc{CGAL::Filtered_exact} \\ -\ccc{CGAL::Fixed_precision_nt} \\ \ccc{CGAL::Gmpq} \\ \ccc{CGAL::Gmpz} \\ \ccc{CGAL::Interval_nt} \\ diff --git a/Number_types/doc_tex/NumberTypeSupport_ref/intro.tex b/Number_types/doc_tex/NumberTypeSupport_ref/intro.tex index 3c41f915d09..5a3f06d7d31 100644 --- a/Number_types/doc_tex/NumberTypeSupport_ref/intro.tex +++ b/Number_types/doc_tex/NumberTypeSupport_ref/intro.tex @@ -64,7 +64,6 @@ \subsection*{Number Type Classes} \ccRefIdfierPage{CGAL::Filtered_exact} \\ -\ccRefIdfierPage{CGAL::Fixed_precision_nt} \\ \ccRefIdfierPage{CGAL::Gmpq} \\ \ccRefIdfierPage{CGAL::Gmpz} \\ \ccRefIdfierPage{CGAL::Interval_nt} \\ diff --git a/Number_types/doc_tex/NumberTypeSupport_ref/main.tex b/Number_types/doc_tex/NumberTypeSupport_ref/main.tex index a51158d7921..7e257381956 100644 --- a/Number_types/doc_tex/NumberTypeSupport_ref/main.tex +++ b/Number_types/doc_tex/NumberTypeSupport_ref/main.tex @@ -8,10 +8,6 @@ \input{NumberTypeSupport_ref/intro.tex} - - - - \input{NumberTypeSupport_ref/abs.tex} \input{NumberTypeSupport_ref/Abs_functor.tex} \input{NumberTypeSupport_ref/compare.tex} @@ -24,7 +20,6 @@ \input{NumberTypeSupport_ref/FieldNumberType.tex} \input{NumberTypeSupport_ref/Field_tag.tex} \input{NumberTypeSupport_ref/Filtered_exact.tex} -\input{NumberTypeSupport_ref/Fixed_precision_nt.tex} \input{NumberTypeSupport_ref/gcd.tex} \input{NumberTypeSupport_ref/Gcd_functor.tex} \input{NumberTypeSupport_ref/gmpxx.tex} diff --git a/Number_types/include/CGAL/FPU.h b/Number_types/include/CGAL/FPU.h index 7a51b8910a9..744b5d69adf 100644 --- a/Number_types/include/CGAL/FPU.h +++ b/Number_types/include/CGAL/FPU.h @@ -226,8 +226,7 @@ typedef unsigned int FPU_CW_t; // The GNU libc version (cf powerpc) is nicer, but doesn't work on libc 5 :( // This one also works with CygWin. // Note that the ISO C99 version is not enough because of the extended -// mantissa issue on x86 (required by Fixed_precision_nt, modular computations -// in the future, but not IA right now). +// mantissa issue on x86 (may be required by some kinds of computation). #define CGAL_IA_SETFPCW(CW) asm volatile ("fldcw %0" : :"m" (CW)) #define CGAL_IA_GETFPCW(CW) asm volatile ("fnstcw %0" : "=m" (CW)) typedef unsigned short FPU_CW_t; @@ -340,7 +339,7 @@ typedef unsigned short FPU_CW_t; // This is a version following the ISO C99 standard, which aims at portability. // The drawbacks are speed on one hand, and also, on x86, it doesn't fix the // extended mantissa issue (this is not a problem for IA, but it is one for -// Fixed_precision_nt, and some future modular computations as well). +// some future modular computations). #define CGAL_IA_SETFPCW(CW) fesetround(CW) #define CGAL_IA_GETFPCW(CW) CW = fegetround() typedef int FPU_CW_t; @@ -379,7 +378,6 @@ FPU_get_and_set_cw (FPU_CW_t cw) // The following is meant to truncate the mantissa of x86 FPUs to 53 bits. -// It is used by the Fixed_precision_nt. inline void force_ieee_double_precision() { #if defined __i386__ || defined _MSC_VER || defined __BORLANDC__ diff --git a/Number_types/include/CGAL/number_type_basic.h b/Number_types/include/CGAL/number_type_basic.h index 832729de9ff..3504c501713 100644 --- a/Number_types/include/CGAL/number_type_basic.h +++ b/Number_types/include/CGAL/number_type_basic.h @@ -90,15 +90,6 @@ CGAL_END_NAMESPACE CGAL_BEGIN_NAMESPACE -// Fixed_precision_nt - -class Fixed_precision_nt; - -double to_double(Fixed_precision_nt); -bool is_finite(Fixed_precision_nt); -bool is_valid(Fixed_precision_nt); -std::pair to_interval(Fixed_precision_nt); - #if 0 // Polynomial diff --git a/Number_types/test/Number_types/utilities.C b/Number_types/test/Number_types/utilities.C index 266e8943a47..6f5e626a138 100644 --- a/Number_types/test/Number_types/utilities.C +++ b/Number_types/test/Number_types/utilities.C @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -72,7 +71,6 @@ int main() TESTIT(long double, "long double") // CGAL number types - TESTIT(CGAL::Fixed_precision_nt, "Fixed_precision_nt") TESTIT(CGAL::MP_Float, "MP_Float") TESTIT(CGAL::Quotient, "Quotient") TESTIT(QMPF, "Quotient")