diff --git a/Packages/Triangulation_3/changes.txt b/Packages/Triangulation_3/changes.txt index e95df08579b..0e56b369831 100644 --- a/Packages/Triangulation_3/changes.txt +++ b/Packages/Triangulation_3/changes.txt @@ -1,3 +1,6 @@ +Version 1.76 (19 July 01) +- Make demos and examples use Filtered_kernel. + Version 1.75 (18 July 01) - Fix return type of Compare_distance_3 in the HierarchyTraits_3 doc. - Remove constructors for vertices in the doc. diff --git a/Packages/Triangulation_3/demo/Triangulation_3/README b/Packages/Triangulation_3/demo/Triangulation_3/README index 20f46ff1453..2a2042cfc89 100644 --- a/Packages/Triangulation_3/demo/Triangulation_3/README +++ b/Packages/Triangulation_3/demo/Triangulation_3/README @@ -1,9 +1,7 @@ The demos use Geomview [see the chapter Geomview in the cgal manual - support library: -Geomview 1.8.1 is required. -Important: The last line in the startup file .geomview must be (echo -"started"). The two commands rsh and Geomview must be in the user's -path, otherwise the program will not be able to execute.] +Geomview 1.8.1 is required. The geomview command must be in the user's $PATH, +otherwise the program will not be able to execute.] ------- demo ------------------------------------------------- Construction of a Delaunay triangulation. @@ -17,10 +15,6 @@ Locates a point a shows the cell containing it Draws the triangulation (edges and cells) in geomview, then the user can move one of the two displayed versions of the triangulation. - -This demo program uses "doubles". -For a robust version, CGAL::Filtered_exact -should be used. -------------------------------------------------------------- ------- demo_color ------------------------------------------- @@ -43,4 +37,3 @@ Constructs a Delaunay triangulation for points on a grid. Then removes all the vertices in random order -------------------------------------------------------------- - diff --git a/Packages/Triangulation_3/demo/Triangulation_3/demo.C b/Packages/Triangulation_3/demo/Triangulation_3/demo.C index 29d74d80ea1..a7bc3c6f0d2 100644 --- a/Packages/Triangulation_3/demo/Triangulation_3/demo.C +++ b/Packages/Triangulation_3/demo/Triangulation_3/demo.C @@ -30,21 +30,11 @@ int main() } #else -#include - -// Workaround for VC++ necessary for Filtered_exact. -#ifdef CGAL_CFG_MATCHING_BUG_2 -# define CGAL_IA_CT double -# define CGAL_IA_PROTECTED true -# define CGAL_IA_CACHE No_Filter_Cache -# define CGAL_IA_ET CGAL::MP_Float -#endif +#include +#include #include -#include -#include - #include #include @@ -53,11 +43,7 @@ int main() #include #include -// using Filtered_exact number type is advised : - -typedef CGAL::Filtered_exact NT; - -typedef CGAL::Cartesian K; +typedef CGAL::Filtered_kernel > K; typedef CGAL::Triangulation_3 Triangulation; typedef CGAL::Delaunay_triangulation_3 Delaunay; diff --git a/Packages/Triangulation_3/demo/Triangulation_3/demo_color.C b/Packages/Triangulation_3/demo/Triangulation_3/demo_color.C index 1d8868d7ff5..626affbff45 100644 --- a/Packages/Triangulation_3/demo/Triangulation_3/demo_color.C +++ b/Packages/Triangulation_3/demo/Triangulation_3/demo_color.C @@ -30,21 +30,11 @@ int main() } #else -#include - -// Workaround for VC++ necessary for Filtered_exact. -#ifdef CGAL_CFG_MATCHING_BUG_2 -# define CGAL_IA_CT double -# define CGAL_IA_PROTECTED true -# define CGAL_IA_CACHE No_Filter_Cache -# define CGAL_IA_ET CGAL::MP_Float -#endif +#include +#include #include -#include -#include - #include #include @@ -73,11 +63,7 @@ public : {} }; -// using Filtered_exact number type is advised : - -typedef CGAL::Filtered_exact NT; - -typedef CGAL::Cartesian K; +typedef CGAL::Filtered_kernel > K; typedef K::Point_3 Point; diff --git a/Packages/Triangulation_3/demo/Triangulation_3/demo_remove.C b/Packages/Triangulation_3/demo/Triangulation_3/demo_remove.C index 99dcb29e8ad..eb96dcff5ae 100644 --- a/Packages/Triangulation_3/demo/Triangulation_3/demo_remove.C +++ b/Packages/Triangulation_3/demo/Triangulation_3/demo_remove.C @@ -31,30 +31,19 @@ int main() #else #include - -// Workaround for VC++ necessary for Filtered_exact. -#ifdef CGAL_CFG_MATCHING_BUG_2 -# define CGAL_IA_CT double -# define CGAL_IA_PROTECTED true -# define CGAL_IA_CACHE No_Filter_Cache -# define CGAL_IA_ET CGAL::MP_Float -#endif +#include #include #include #include -#include -#include - #include #include #include #include -typedef CGAL::Filtered_exact NT; -typedef CGAL::Cartesian K; +typedef CGAL::Filtered_kernel > K; typedef CGAL::Triangulation_vertex_base_3 Vb; typedef CGAL::Triangulation_hierarchy_vertex_base_3 Vbh; diff --git a/Packages/Triangulation_3/demo/Triangulation_3/demo_voronoi.C b/Packages/Triangulation_3/demo/Triangulation_3/demo_voronoi.C index 61fee110c08..e6c378f404a 100644 --- a/Packages/Triangulation_3/demo/Triangulation_3/demo_voronoi.C +++ b/Packages/Triangulation_3/demo/Triangulation_3/demo_voronoi.C @@ -30,21 +30,11 @@ int main() } #else -#include - -// Workaround for VC++ necessary for Filtered_exact. -#ifdef CGAL_CFG_MATCHING_BUG_2 -# define CGAL_IA_CT double -# define CGAL_IA_PROTECTED true -# define CGAL_IA_CACHE No_Filter_Cache -# define CGAL_IA_ET CGAL::MP_Float -#endif +#include +#include #include -#include -#include - #include #include @@ -53,11 +43,7 @@ int main() #include #include -// using Filtered_exact number type is advised : - -typedef CGAL::Filtered_exact NT; - -typedef CGAL::Cartesian K; +typedef CGAL::Filtered_kernel > K; typedef CGAL::Triangulation_3 Triangulation; typedef CGAL::Delaunay_triangulation_3 Delaunay; diff --git a/Packages/Triangulation_3/examples/Triangulation_3/README b/Packages/Triangulation_3/examples/Triangulation_3/README index a4436f13528..dec6484ebdf 100644 --- a/Packages/Triangulation_3/examples/Triangulation_3/README +++ b/Packages/Triangulation_3/examples/Triangulation_3/README @@ -4,7 +4,4 @@ Construction of a triangulation. Makes different tests on it. Writes the triangulation into a file "output" - -This example program uses "doubles". -For a robust version, another arithmetic should be used. -------------------------------------------------------------- diff --git a/Packages/Triangulation_3/examples/Triangulation_3/example_color.C b/Packages/Triangulation_3/examples/Triangulation_3/example_color.C index 8af8b3e826e..1b78aeb5e64 100644 --- a/Packages/Triangulation_3/examples/Triangulation_3/example_color.C +++ b/Packages/Triangulation_3/examples/Triangulation_3/example_color.C @@ -1,17 +1,7 @@ // Triangulation_3/example_color.C -#include - -// Workaround for VC++ necessary for Filtered_exact. -#ifdef CGAL_CFG_MATCHING_BUG_2 -# define CGAL_IA_CT double -# define CGAL_IA_PROTECTED true -# define CGAL_IA_CACHE No_Filter_Cache -# define CGAL_IA_ET CGAL::MP_Float -#endif - +#include +#include #include -#include -#include #include @@ -40,11 +30,7 @@ public : {} }; -// using Filtered_exact number type is advised : - -typedef CGAL::Filtered_exact NT; - -typedef CGAL::Cartesian K; +typedef CGAL::Filtered_kernel > K; typedef K::Point_3 Point; diff --git a/Packages/Triangulation_3/examples/Triangulation_3/example_hierarchy.C b/Packages/Triangulation_3/examples/Triangulation_3/example_hierarchy.C index 09b25c32d9b..eb3aa2bef35 100644 --- a/Packages/Triangulation_3/examples/Triangulation_3/example_hierarchy.C +++ b/Packages/Triangulation_3/examples/Triangulation_3/example_hierarchy.C @@ -1,30 +1,14 @@ // Triangulation_3/example_hierarchy.C -#include +#include +#include -// Workaround for VC++ necessary for Filtered_exact. -#ifdef CGAL_CFG_MATCHING_BUG_2 -# define CGAL_IA_CT double -# define CGAL_IA_PROTECTED true -# define CGAL_IA_CACHE No_Filter_Cache -# define CGAL_IA_ET CGAL::MP_Float -#endif - -#include #include #include -#include -#include #include #include -// using Filtered_exact number type is advised : - -typedef CGAL::Filtered_exact NT; - -// chosing the representation (Cartesian or homogeneous) - -typedef CGAL::Cartesian K; +typedef CGAL::Filtered_kernel > K; typedef CGAL::Triangulation_vertex_base_3 Vb; typedef CGAL::Triangulation_hierarchy_vertex_base_3 Vbh; diff --git a/Packages/Triangulation_3/examples/Triangulation_3/example_simple.C b/Packages/Triangulation_3/examples/Triangulation_3/example_simple.C index 2045defc7d0..4f15b300d00 100644 --- a/Packages/Triangulation_3/examples/Triangulation_3/example_simple.C +++ b/Packages/Triangulation_3/examples/Triangulation_3/example_simple.C @@ -1,17 +1,8 @@ // Triangulation_3/example_simple.C -#include - -// Workaround for VC++ necessary for Filtered_exact. -#ifdef CGAL_CFG_MATCHING_BUG_2 -# define CGAL_IA_CT double -# define CGAL_IA_PROTECTED true -# define CGAL_IA_CACHE No_Filter_Cache -# define CGAL_IA_ET CGAL::MP_Float -#endif +#include +#include #include -#include -#include #include #include @@ -19,13 +10,7 @@ #include #include -// using Filtered_exact number type is advised : - -typedef CGAL::Filtered_exact NT; - -// chosing the representation (Cartesian or homogeneous) - -typedef CGAL::Cartesian K; +typedef CGAL::Filtered_kernel > K; typedef CGAL::Triangulation_3 Triangulation;