diff --git a/Segment_Delaunay_graph_2/changes.txt b/Segment_Delaunay_graph_2/changes.txt index a8e6d107e88..dbe527fb9a5 100644 --- a/Segment_Delaunay_graph_2/changes.txt +++ b/Segment_Delaunay_graph_2/changes.txt @@ -1,3 +1,6 @@ +21 July 2006: Menelaos Karavelas +- test suite for traits does not involve Filtered_exact any more. + 17 July 2006: Menelaos Karavelas - fixed bug in Segment_Delaunay_graph_vertex_base_with_info_2. Bug spotted by Laurent Masse-Navette . diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp index 187bf3de74b..b5b1f432af1 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/test_sdg_traits_2.cpp @@ -1,13 +1,10 @@ #include -#define DONT_USE_FILTERED_EXACT - #include #include #include #include -#include #include #include #include @@ -35,19 +32,6 @@ typedef CGAL::Simple_cartesian Gmpq_Kernel; typedef CGAL::Simple_cartesian Gmpz_Kernel; #endif -template -struct FE_Kernel - : public CGAL::Simple_cartesian< CGAL::Filtered_exact > -{}; - -#ifdef CGAL_USE_CORE -typedef FE_Kernel FE_CORE_Kernel; -#endif -#ifdef CGAL_USE_GMP -typedef FE_Kernel FE_Gmpz_Kernel; -typedef FE_Kernel FE_Gmpq_Kernel; -#endif - typedef CGAL::Ring_tag Ring; typedef CGAL::Field_tag Field; typedef CGAL::Sqrt_field_tag Sqrt; @@ -179,42 +163,6 @@ typedef CGAL::Segment_Delaunay_graph_filtered_traits_2 F_Gmpq_Field_Gt; #endif -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- - -#ifdef CGAL_USE_CORE -typedef CGAL::Segment_Delaunay_graph_traits_without_intersections_2 - -FE_CORE_Ring_Gtwi; - -typedef CGAL::Segment_Delaunay_graph_traits_without_intersections_2 - -FE_CORE_Sqrt_Gtwi; - -typedef CGAL::Segment_Delaunay_graph_traits_2 -FE_CORE_Field_Gt; - -typedef CGAL::Segment_Delaunay_graph_traits_2 -FE_CORE_Sqrt_Gt; -#endif - -//---------------------------------------------------------------------- - -#ifdef CGAL_USE_GMP -typedef CGAL::Segment_Delaunay_graph_traits_without_intersections_2 - -FE_Gmpz_Ring_Gtwi; - -//---------------------------------------------------------------------- - -typedef CGAL::Segment_Delaunay_graph_traits_without_intersections_2 - -FE_Gmpq_Ring_Gtwi; - -typedef CGAL::Segment_Delaunay_graph_traits_2 -FE_Gmpq_Field_Gt; -#endif - //---------------------------------------------------------------------- //---------------------------------------------------------------------- //---------------------------------------------------------------------- @@ -331,7 +279,6 @@ int main(int argc, char* argv[]) test_traits("Gmpq Field"); #endif -#ifndef DONT_USE_FILTERED_EXACT std::cout << std::endl; std::cout << "************************************" << "************************************" << std::endl; @@ -357,22 +304,6 @@ int main(int argc, char* argv[]) << "************************************" << std::endl; std::cout << std::endl; -#ifdef CGAL_USE_CORE - test_traits("FE CORE Ring WI"); - test_traits("FE CORE Sqrt WI"); - - test_traits("FE CORE Field"); - test_traits("FE CORE Sqrt"); -#endif - -#ifdef CGAL_USE_GMP - test_traits("FE Gmpz Ring WI"); - - test_traits("FE Gmpq Ring WI"); - test_traits("FE Gmpq Field"); -#endif - -#endif // DONT_USE_FILTERED_EXACT return 0; }