From c9dc205525d4baf841beaae8fb84d42e0ec710b5 Mon Sep 17 00:00:00 2001 From: Michael Hemmer Date: Wed, 15 Nov 2006 16:23:37 +0000 Subject: [PATCH] rm Number_type_traits Ring_tag -> Integral_domain_without_division_tag Sqrt_field_tag -> Field_with_sqrt_tag --- .../demo/Apollonius_graph_2/typedefs.h | 2 +- .../Apollonius_graph_2/ag2_exact_traits_sqrt.cpp | 2 +- .../examples/Apollonius_graph_2/ag2_hierarchy.cpp | 4 ++-- Apollonius_graph_2/generators/mk_degen.cpp | 4 ++-- .../Bounded_side_of_ccw_circle_C2.h | 4 ++-- .../CGAL/Apollonius_graph_2/Finite_edge_test_C2.h | 12 ++++++------ .../include/CGAL/Apollonius_graph_2/Incircle_C2.h | 12 ++++++------ .../CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h | 4 ++-- .../include/CGAL/Apollonius_graph_2/Is_hidden_C2.h | 4 ++-- .../include/CGAL/Apollonius_graph_2/Orientation_2.h | 4 ++-- .../Oriented_side_of_bisector_C2.h | 4 ++-- .../include/CGAL/Apollonius_graph_2/basic.h | 2 +- .../Apollonius_graph_mixed_filtered_traits_2.h | 2 +- .../new_traits/Apollonius_graph_mixed_traits_2.h | 4 ++-- .../Apollonius_graph_new_filtered_traits_2.h | 2 +- .../new_traits/Apollonius_graph_new_traits_2.h | 4 ++-- .../Apollonius_graph_uncertain_filtered_traits_2.h | 2 +- .../uncertain/Uncertain_is_hidden_C2.h | 6 +++--- .../Uncertain_oriented_side_of_bisector_C2.h | 6 +++--- .../CGAL/Apollonius_graph_filtered_traits_2.h | 2 +- .../include/CGAL/Apollonius_graph_traits_2.h | 4 ++-- Apollonius_graph_2/include/CGAL/Parabola_2.h | 9 ++++----- .../test/Apollonius_graph_2/test_ag2.cpp | 2 +- .../test/Apollonius_graph_2/test_ag_hierarchy_2.cpp | 2 +- .../test/Apollonius_graph_2/test_ag_traits_2.cpp | 4 ++-- 25 files changed, 53 insertions(+), 54 deletions(-) diff --git a/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h b/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h index ca9f698e9b2..38f9e1ee6c7 100644 --- a/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h +++ b/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h @@ -37,7 +37,7 @@ typedef CGAL::Simple_cartesian Rep; #include -typedef CGAL::Apollonius_graph_filtered_traits_2 Gt; +typedef CGAL::Apollonius_graph_filtered_traits_2 Gt; typedef Gt::Point_2 Point_2; typedef Rep::Circle_2 Circle_2; diff --git a/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_exact_traits_sqrt.cpp b/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_exact_traits_sqrt.cpp index 75a4e191949..e70f37e4ae8 100644 --- a/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_exact_traits_sqrt.cpp +++ b/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_exact_traits_sqrt.cpp @@ -46,7 +46,7 @@ typedef CGAL::Simple_cartesian Kernel; // the traits class is now going to assume that the operations // +,-,*,/ and sqrt are supported exactly typedef -CGAL::Apollonius_graph_traits_2 Traits; +CGAL::Apollonius_graph_traits_2 Traits; typedef CGAL::Apollonius_graph_2 Apollonius_graph; diff --git a/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_hierarchy.cpp b/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_hierarchy.cpp index 906c4fa0224..78ef1b59cd8 100644 --- a/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_hierarchy.cpp +++ b/Apollonius_graph_2/examples/Apollonius_graph_2/ag2_hierarchy.cpp @@ -34,8 +34,8 @@ typedef CGAL::Simple_cartesian EK; // constructions (field operations plus square roots) are different // from the operations allowed when the exact kernel is used (ring // operations). -typedef CGAL::Sqrt_field_tag CM; -typedef CGAL::Ring_tag EM; +typedef CGAL::Field_with_sqrt_tag CM; +typedef CGAL::Integral_domain_without_division_tag EM; typedef CGAL::Apollonius_graph_filtered_traits_2 Traits; // Now we use the Apollonius graph hierarchy. diff --git a/Apollonius_graph_2/generators/mk_degen.cpp b/Apollonius_graph_2/generators/mk_degen.cpp index c560b8de2b8..368f2f2594b 100644 --- a/Apollonius_graph_2/generators/mk_degen.cpp +++ b/Apollonius_graph_2/generators/mk_degen.cpp @@ -13,8 +13,8 @@ typedef CGAL::Simple_cartesian CK; typedef CGAL::Simple_cartesian EK; -typedef CGAL::Sqrt_field_tag CM; -typedef CGAL::Ring_tag EM; +typedef CGAL::Field_with_sqrt_tag CM; +typedef CGAL::Integral_domain_without_division_tag EM; typedef CGAL::Apollonius_graph_filtered_traits_2 Traits; typedef Traits::Site_2 Site; diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h index 6115538bb37..978946c0def 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h @@ -43,7 +43,7 @@ public: public: inline - Sign operator()(const Voronoi_radius& vr, const Sqrt_field_tag&) const + Sign operator()(const Voronoi_radius& vr, const Field_with_sqrt_tag&) const { FT r = vr.c1() + vr.c2() * CGAL::sqrt(vr.delta()); return CGAL::sign(r); @@ -51,7 +51,7 @@ public: inline - Sign operator()(const Voronoi_radius& vr, const Ring_tag&) const + Sign operator()(const Voronoi_radius& vr, const Integral_domain_without_division_tag&) const { // this is another way of doing this; the degree becomes 10 // instead of 5 in this case. diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h index 60299fa8f45..fb41921b835 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h @@ -48,7 +48,7 @@ public: Orientation operator()(const Voronoi_circle& vc, const Point_2& p1, - const Point_2& p2, const Sqrt_field_tag&) const + const Point_2& p2, const Field_with_sqrt_tag&) const { FT a = vc.a1() + vc.a2() * CGAL::sqrt(vc.delta()); FT b = vc.b1() + vc.b2() * CGAL::sqrt(vc.delta()); @@ -58,7 +58,7 @@ public: Orientation operator()(const Voronoi_circle& vc, const Point_2& p1, - const Point_2& p2, const Ring_tag&) const + const Point_2& p2, const Integral_domain_without_division_tag&) const { FT dx = p2.x() - p1.x(); FT dy = p2.y() - p1.y(); @@ -140,7 +140,7 @@ private: public: Comparison_result operator()(const Voronoi_circle& vc1, const Voronoi_circle& vc2, - const Sqrt_field_tag&) const + const Field_with_sqrt_tag&) const { FT c1 = (vc1.c1() + vc1.c2() * CGAL::sqrt(vc1.delta())) / vc1.d(); FT c2 = (vc2.c1() + vc2.c2() * CGAL::sqrt(vc2.delta())) / vc2.d(); @@ -154,7 +154,7 @@ public: /* Comparison_result operator()(const Voronoi_circle& vc1, const Voronoi_circle& vc2, - Ring_tag) + Integral_domain_without_division_tag) { FT A = vc1.c1() * vc2.d() - vc2.c1() * vc1.d(); FT B = vc1.c2() * vc2.d(); @@ -171,7 +171,7 @@ public: Comparison_result operator()(const Voronoi_circle& vc1, const Voronoi_circle& vc2, - const Ring_tag&) const + const Integral_domain_without_division_tag&) const { bool is_first_root1 = vc1.is_first_root(); bool is_first_root2 = vc2.is_first_root(); @@ -214,7 +214,7 @@ public: /* Comparison_result operator()(const Voronoi_circle& vc1, const Voronoi_circle& vc2, - Ring_tag) + Integral_domain_without_division_tag) { bool is_first_root1 = vc1.is_first_root(); bool is_first_root2 = vc2.is_first_root(); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h index e36eec2ef41..dc4420a164b 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h @@ -49,7 +49,7 @@ public: inline Sign operator()(const Bitangent_line& bl, const Site_2& q, - const Sqrt_field_tag&) const + const Field_with_sqrt_tag&) const { #ifdef AG2_PROFILE_PREDICATES ag2_predicate_profiler::distance_from_bitangent_counter++; @@ -63,7 +63,7 @@ public: inline Sign operator()(const Bitangent_line& bl, const Site_2& q, - const Ring_tag&) const + const Integral_domain_without_division_tag&) const { #ifdef AG2_PROFILE_PREDICATES ag2_predicate_profiler::distance_from_bitangent_counter++; @@ -91,7 +91,7 @@ public: inline Sign operator()(const Bitangent_line& bl, const Inverted_weighted_point& v, - const Sqrt_field_tag&) const + const Field_with_sqrt_tag&) const { FT a = bl.a1() + bl.a2() * CGAL::sqrt(bl.delta()); FT b = bl.b1() + bl.b2() * CGAL::sqrt(bl.delta()); @@ -103,7 +103,7 @@ public: inline Sign operator()(const Bitangent_line& bl, const Inverted_weighted_point& v, - const Ring_tag&) const + const Integral_domain_without_division_tag&) const { FT A = bl.a1() * v.x() + bl.b1() * v.y() + bl.c1() * v.p() - v.weight() * bl.d(); @@ -158,7 +158,7 @@ public: private: inline Orientation orientation(const Bitangent_line& l, const Point_2& p, - const Sqrt_field_tag&) const + const Field_with_sqrt_tag&) const { FT A = l.a1() * p.x() + l.b1() * p.y() + l.c1(); FT B = l.a2() * p.x() + l.b2() * p.y() + l.c2(); @@ -168,7 +168,7 @@ private: inline Orientation orientation(const Bitangent_line& l, const Point_2& p, - const Ring_tag&) const + const Integral_domain_without_division_tag&) const { FT A = l.a1() * p.x() + l.b1() * p.y() + l.c1(); FT B = l.a2() * p.x() + l.b2() * p.y() + l.c2(); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h index ab34378c069..b36b1a17f81 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h @@ -121,7 +121,7 @@ public: } Sign chi2(const Bitangent_line& bl1, - const Bitangent_line& bl2, Sqrt_field_tag) const + const Bitangent_line& bl2, Field_with_sqrt_tag) const { FT sigma = bl1.dx() * bl2.dx() + bl1.dy() * bl2.dy(); FT delta = bl1.dx() * bl2.dy() - bl1.dy() * bl2.dx(); @@ -143,7 +143,7 @@ public: inline Sign chi2(const Bitangent_line& bl1, - const Bitangent_line& bl2, Ring_tag) const + const Bitangent_line& bl2, Integral_domain_without_division_tag) const { return chi2(bl1.dx(), bl1.dy(), -bl1.dw(), bl1.d(), bl1.delta(), bl2.dx(), bl2.dy(), -bl2.dw(), bl2.d(), bl2.delta()); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h index 06aa9895194..586980babc7 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h @@ -44,7 +44,7 @@ public: private: bool is_hidden(const Site_2& p, const Site_2& q, - const Ring_tag&) const + const Integral_domain_without_division_tag&) const { RT w1 = p.weight(); RT w2 = q.weight(); @@ -57,7 +57,7 @@ private: } bool is_hidden(const Site_2& p, const Site_2& q, - const Sqrt_field_tag&) const + const Field_with_sqrt_tag&) const { RT d = CGAL::sqrt(CGAL::square(p.x() - q.x()) + CGAL::square(p.y() - q.y())); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h index fa27c41920b..a37a7a29465 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h @@ -56,7 +56,7 @@ private: private: Orientation vv_orientation(const Voronoi_circle& vc, const Point_2& sp1, const Point_2& p1, const Point_2& p2, - const Sqrt_field_tag&) const + const Field_with_sqrt_tag&) const { FT a = vc.a1() + vc.a2() * CGAL::sqrt(vc.delta()); FT b = vc.b1() + vc.b2() * CGAL::sqrt(vc.delta()); @@ -69,7 +69,7 @@ private: Orientation vv_orientation(const Voronoi_circle vc, const Point_2& sp1, const Point_2& p1, const Point_2& p2, - const Ring_tag&) const + const Integral_domain_without_division_tag&) const { FT dx = p2.x() - p1.x(); FT dy = p2.y() - p1.y(); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h index de92266c175..65a93ec6bf6 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h @@ -50,7 +50,7 @@ private: private: Comparison_result compare_distances(const Site_2& p1, const Site_2& p2, - const Point_2& p, const Ring_tag&) const + const Point_2& p, const Integral_domain_without_division_tag&) const { #ifdef AG2_PROFILE_PREDICATES ag2_predicate_profiler::side_of_bisector_counter++; @@ -85,7 +85,7 @@ private: Comparison_result compare_distances(const Site_2& p1, const Site_2& p2, - const Point_2 &p, const Sqrt_field_tag&) const + const Point_2 &p, const Field_with_sqrt_tag&) const { #ifdef AG2_PROFILE_PREDICATES ag2_predicate_profiler::side_of_bisector_counter++; diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h index ca9a9c38908..2fe2f2c2e64 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h @@ -21,7 +21,7 @@ #define CGAL_APOLLONIUS_GRAPH_2_BASIC_H 1 #include -#include +#include #include #define CGAL_APOLLONIUS_GRAPH_2_NS CGAL::ApolloniusGraph_2 diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_filtered_traits_2.h index b1c4ec22385..15a53163c6f 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_filtered_traits_2.h @@ -73,7 +73,7 @@ namespace CGALi { template, class EK_MTag = CK_MTag, class FK_t = Simple_cartesian< Interval_nt >, diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_traits_2.h index 251d46384a3..0aa6dec5150 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_mixed_traits_2.h @@ -31,7 +31,7 @@ #include #endif -#include +#include #include @@ -47,7 +47,7 @@ CGAL_BEGIN_NAMESPACE //----------------------------------------------------------------------- //----------------------------------------------------------------------- //----------------------------------------------------------------------- -template < class Rep, class MTag = Ring_tag > +template < class Rep, class MTag = Integral_domain_without_division_tag > class Apollonius_graph_mixed_traits_2 { public: diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_filtered_traits_2.h index a363b477646..2b88bafce3c 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_filtered_traits_2.h @@ -73,7 +73,7 @@ namespace CGALi { template, class EK_MTag = CK_MTag, class FK_t = Simple_cartesian< Interval_nt >, diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_traits_2.h index 573538b4a47..8cf0d2d653c 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_traits_2.h @@ -31,7 +31,7 @@ #include #endif -#include +#include #include @@ -47,7 +47,7 @@ CGAL_BEGIN_NAMESPACE //----------------------------------------------------------------------- //----------------------------------------------------------------------- //----------------------------------------------------------------------- -template < class Rep, class MTag = Ring_tag > +template < class Rep, class MTag = Integral_domain_without_division_tag > class Apollonius_graph_new_traits_2 { public: diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h index 5ee39f3dc3c..3b4800ee9e1 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h @@ -81,7 +81,7 @@ namespace CGALi { template, class EK_MTag = CK_MTag, class FK_t = Simple_cartesian< Interval_nt >, diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h index df69e831714..5d6f0d0c254 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_is_hidden_C2.h @@ -24,7 +24,7 @@ #include #include -#include +#include CGAL_BEGIN_NAMESPACE @@ -43,7 +43,7 @@ public: private: Uncertain is_hidden(const Site_2& p, const Site_2& q, - const Ring_tag&) const + const Integral_domain_without_division_tag&) const { RT w1 = p.weight(); RT w2 = q.weight(); @@ -64,7 +64,7 @@ private: } Uncertain is_hidden(const Site_2& p, const Site_2& q, - const Sqrt_field_tag&) const + const Field_with_sqrt_tag&) const { RT d = CGAL::sqrt(CGAL::square(p.x() - q.x()) + CGAL::square(p.y() - q.y())); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h index f6e78442532..7ece69bf0a2 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_oriented_side_of_bisector_C2.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include CGAL_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ private: private: Uncertain compare_distances(const Site_2& p1, const Site_2& p2, - const Point_2& p, const Ring_tag&) const + const Point_2& p, const Integral_domain_without_division_tag&) const { #ifdef AG2_PROFILE_PREDICATES ag2_predicate_profiler::side_of_bisector_counter++; @@ -98,7 +98,7 @@ private: Comparison_result compare_distances(const Site_2& p1, const Site_2& p2, - const Point_2 &p, const Sqrt_field_tag&) const + const Point_2 &p, const Field_with_sqrt_tag&) const { #ifdef AG2_PROFILE_PREDICATES ag2_predicate_profiler::side_of_bisector_counter++; diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h index 624234bc70d..329fd997553 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h @@ -72,7 +72,7 @@ namespace CGALi { template, class EK_MTag = CK_MTag, class FK_t = Simple_cartesian< Interval_nt >, diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h index 10a2a9d44c9..b9343610d95 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h @@ -31,7 +31,7 @@ #include #endif -#include +#include #include @@ -47,7 +47,7 @@ CGAL_BEGIN_NAMESPACE //----------------------------------------------------------------------- //----------------------------------------------------------------------- //----------------------------------------------------------------------- -template < class Rep, class MTag = Ring_tag > +template < class Rep, class MTag = Integral_domain_without_division_tag > class Apollonius_graph_traits_2 { public: diff --git a/Apollonius_graph_2/include/CGAL/Parabola_2.h b/Apollonius_graph_2/include/CGAL/Parabola_2.h index 6742913ce9c..40dd5c2d931 100644 --- a/Apollonius_graph_2/include/CGAL/Parabola_2.h +++ b/Apollonius_graph_2/include/CGAL/Parabola_2.h @@ -78,10 +78,10 @@ protected: inline static FT divide(const FT& x, const FT& y) { - static typename Number_type_traits::Has_division has_division; - return divide(x, y, has_division); + return divide(x, y, + Boolean_tag< ! CGALi::Is_integral_domain_without_division::value >()); } - + inline static FT sqrt(const FT& x, const Tag_false&) { return CGAL::sqrt(CGAL::to_double(x)); @@ -94,8 +94,7 @@ protected: inline static FT sqrt(const FT& x) { - static typename Number_type_traits::Has_sqrt has_sqrt; - return sqrt(x, has_sqrt); + return sqrt(x, Boolean_tag::value >()); } inline static diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp index 7c6751b6431..b178af082e4 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp +++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp @@ -27,7 +27,7 @@ struct Kernel : public CGAL::Simple_cartesian {}; #include -typedef CGAL::Ring_tag Method_tag; +typedef CGAL::Integral_domain_without_division_tag Method_tag; #include "./include/test.h" diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp index d5ea9d03b16..c1366822b68 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp +++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp @@ -28,7 +28,7 @@ struct Kernel : public CGAL::Simple_cartesian {}; #include -typedef CGAL::Ring_tag Method_tag; +typedef CGAL::Integral_domain_without_division_tag Method_tag; #include "./include/test.h" diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp index 560b8de2dd8..44f0aeb75fa 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp +++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp @@ -27,7 +27,7 @@ struct Kernel : public CGAL::Simple_cartesian {}; #include -typedef CGAL::Ring_tag Method_tag; +typedef CGAL::Integral_domain_without_division_tag Method_tag; #include "./include/test.h" @@ -45,7 +45,7 @@ int main(int argc, char* argv[]) assert( ifs_traits ); // bool is_ok = - // CGAL::test_traits(ifs_traits); + // CGAL::test_traits(ifs_traits); std::cout << "testing the traits class..." << std::flush;