diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h index ca7d38a680c..861c4d2c822 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h @@ -18,13 +18,11 @@ of Delaunay triangulations. \cgalRefines `TriangulationTraits_2` -\cgalHasModel All CGAL Kernels -\cgalHasModel `CGAL::Regular_triangulation_euclidean_traits_2` +\cgalHasModel All models of `Kernel`. -\sa `TriangulationTraits_2` +\sa `CGAL::Regular_triangulation_2` */ - class RegularTriangulationTraits_2 { public: @@ -93,6 +91,12 @@ power distance between `p` and `r`. */ typedef unspecified_type Compare_power_distance_2; +/// @} + +/// \name +/// The following types/predicates are required to compute duals: +/// @{ + /*! A function object, model of `Kernel::ConstructWeightedCircumcenter_2`, @@ -117,7 +121,7 @@ Must provide the operator: */ typedef unspecified_type Construct_radical_axis_2; -/// @} +/// @} /// \name Creation /// @{ diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h index c4d1957affa..086f5d7f189 100644 --- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h +++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h @@ -10,12 +10,12 @@ provides the types of the geometric primitives used in the triangulation and some function object types for the required predicates on those primitives. -\cgalHasModel All the \cgal Kernels +\cgalHasModel All models of `Kernel`. \cgalHasModel `CGAL::Projection_traits_xy_3` \cgalHasModel `CGAL::Projection_traits_yz_3` \cgalHasModel `CGAL::Projection_traits_xz_3` -\sa `CGAL::Triangulation_2` +\sa `CGAL::Triangulation_2` */ diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h index e61b62c8375..7e24e51bf85 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h @@ -15,14 +15,15 @@ or the weighted point \f$ {p}^{(w)}=(p,w_p)\f$. \cgalRefines `TriangulationTraits_3` +\cgalHasModel All models of `Kernel`. + +\sa `CGAL::Regular_triangulation_3` + In addition to the requirements described for the traits class of `CGAL::Triangulation_3`, the geometric traits class of `CGAL::Regular_triangulation_3` must fulfill the following requirements. - \cgalHasModel All CGAL Kernels - */ - class RegularTriangulationTraits_3 { public: @@ -124,7 +125,7 @@ typedef unspecified_type Power_side_of_oriented_power_sphere_3; /*! A predicate object, -model of `ComparePowerDistance_3`, +model of `Kernel::ComparePowerDistance_3`, that must provide the function operator `Comparison_result operator()(Point_3 p, Weighted_point_3 q, Weighted_point_3 r)`, diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h index 7765534c4fb..f7dbb8d9b4f 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h @@ -9,14 +9,9 @@ triangles and tetrahedra) forming the triangulation together with a few geometric predicates and constructions on these objects : lexicographical comparison, orientation in case of coplanar points and orientation in space. -\cgalHasModel CGAL::Exact_predicates_inexact_constructions_kernel (recommended) -\cgalHasModel CGAL::Exact_predicates_exact_constructions_kernel -\cgalHasModel CGAL::Filtered_kernel -\cgalHasModel CGAL::Cartesian -\cgalHasModel CGAL::Simple_cartesian -\cgalHasModel CGAL::Homogeneous -\cgalHasModel CGAL::Simple_homogeneous +\cgalHasModel All models of `Kernel`. +\sa `CGAL::Triangulation_3` */ class TriangulationTraits_3 {