From 55d538b33582395da37fc7ca4594c92b619d45a2 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Thu, 17 Apr 2008 10:13:31 +0000 Subject: [PATCH] "Ambient" is not spelled "Ambiant" in English... --- .../include/CGAL/Cartesian/Cartesian_base.h | 4 +- Conic_2/include/CGAL/Conic_2.h | 2 +- .../include/CGAL/Filtered_kernel.h | 4 +- Filtered_kernel/include/CGAL/Lazy_kernel.h | 4 +- .../CGAL/Homogeneous/Homogeneous_base.h | 4 +- ...nt_dimension.tex => Ambient_dimension.tex} | 8 +-- .../doc_tex/Kernel_23_ref/Dimension_tag.tex | 2 +- .../Kernel_23_ref/Dynamic_dimension_tag.tex | 2 +- .../Kernel_23_ref/Feature_dimension.tex | 2 +- Kernel_23/doc_tex/Kernel_23_ref/main.tex | 2 +- Kernel_23/include/CGAL/Aff_transformation_2.h | 2 +- Kernel_23/include/CGAL/Aff_transformation_3.h | 2 +- Kernel_23/include/CGAL/Bbox_2.h | 2 +- Kernel_23/include/CGAL/Bbox_3.h | 2 +- Kernel_23/include/CGAL/Circle_2.h | 2 +- Kernel_23/include/CGAL/Dimension.h | 8 +-- Kernel_23/include/CGAL/Direction_2.h | 2 +- Kernel_23/include/CGAL/Direction_3.h | 2 +- Kernel_23/include/CGAL/Iso_cuboid_3.h | 2 +- Kernel_23/include/CGAL/Iso_rectangle_2.h | 2 +- Kernel_23/include/CGAL/Line_2.h | 2 +- Kernel_23/include/CGAL/Line_3.h | 2 +- Kernel_23/include/CGAL/Plane_3.h | 2 +- Kernel_23/include/CGAL/Point_2.h | 2 +- Kernel_23/include/CGAL/Point_3.h | 2 +- Kernel_23/include/CGAL/Ray_2.h | 2 +- Kernel_23/include/CGAL/Ray_3.h | 2 +- Kernel_23/include/CGAL/Segment_2.h | 2 +- Kernel_23/include/CGAL/Segment_3.h | 2 +- Kernel_23/include/CGAL/Sphere_3.h | 2 +- Kernel_23/include/CGAL/Tetrahedron_3.h | 2 +- Kernel_23/include/CGAL/Triangle_2.h | 2 +- Kernel_23/include/CGAL/Triangle_3.h | 2 +- Kernel_23/include/CGAL/Vector_2.h | 2 +- Kernel_23/include/CGAL/Vector_3.h | 2 +- Kernel_23/test/Kernel_23/Dimension.cpp | 72 +++++++++---------- Kernel_d/include/CGAL/Cartesian_d.h | 4 +- Kernel_d/include/CGAL/Homogeneous_d.h | 4 +- .../CGAL/Kernel_d/Aff_transformation_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Direction_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Line_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Point_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Ray_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Segment_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Sphere_d.h | 2 +- Kernel_d/include/CGAL/Kernel_d/Vector_d.h | 2 +- .../include/CGAL/barycenter.h | 4 +- .../include/CGAL/bounding_box.h | 6 +- .../include/CGAL/centroid.h | 10 +-- 51 files changed, 105 insertions(+), 105 deletions(-) rename Kernel_23/doc_tex/Kernel_23_ref/{Ambiant_dimension.tex => Ambient_dimension.tex} (81%) diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h index 96f3ab93da3..290be6e2731 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h @@ -102,8 +102,8 @@ struct Cartesian_base Angle; template - struct Ambiant_dimension { - typedef typename T::Ambiant_dimension type; + struct Ambient_dimension { + typedef typename T::Ambient_dimension type; }; template diff --git a/Conic_2/include/CGAL/Conic_2.h b/Conic_2/include/CGAL/Conic_2.h index 03c3241a9f2..c30f75d4339 100644 --- a/Conic_2/include/CGAL/Conic_2.h +++ b/Conic_2/include/CGAL/Conic_2.h @@ -40,7 +40,7 @@ class Conic_2 : public R_::Kernel_base::Conic_2 { public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; // types diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel.h b/Filtered_kernel/include/CGAL/Filtered_kernel.h index a7ce445f4f2..c16ea3961b2 100644 --- a/Filtered_kernel/include/CGAL/Filtered_kernel.h +++ b/Filtered_kernel/include/CGAL/Filtered_kernel.h @@ -68,8 +68,8 @@ struct Filtered_kernel_base }; template < typename T > - struct Ambiant_dimension { - typedef typename T::Ambiant_dimension type; // maybe not the right way... + struct Ambient_dimension { + typedef typename T::Ambient_dimension type; // maybe not the right way... }; template < typename T > diff --git a/Filtered_kernel/include/CGAL/Lazy_kernel.h b/Filtered_kernel/include/CGAL/Lazy_kernel.h index b9f927dbb6e..cb6f6aa1f7d 100644 --- a/Filtered_kernel/include/CGAL/Lazy_kernel.h +++ b/Filtered_kernel/include/CGAL/Lazy_kernel.h @@ -60,8 +60,8 @@ public: struct Base { typedef Lazy_kernel_generic_base Type; }; template < typename T > - struct Ambiant_dimension { - typedef typename T::Ambiant_dimension type; + struct Ambient_dimension { + typedef typename T::Ambient_dimension type; }; template < typename T > diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h index 12807f1fcc7..1a0ba380108 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h @@ -109,8 +109,8 @@ struct Homogeneous_base Angle; template - struct Ambiant_dimension { - typedef typename T::Ambiant_dimension type; + struct Ambient_dimension { + typedef typename T::Ambient_dimension type; }; template diff --git a/Kernel_23/doc_tex/Kernel_23_ref/Ambiant_dimension.tex b/Kernel_23/doc_tex/Kernel_23_ref/Ambient_dimension.tex similarity index 81% rename from Kernel_23/doc_tex/Kernel_23_ref/Ambiant_dimension.tex rename to Kernel_23/doc_tex/Kernel_23_ref/Ambient_dimension.tex index 46fc8889f34..4233eb3a1ae 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/Ambiant_dimension.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/Ambient_dimension.tex @@ -1,7 +1,7 @@ -\begin{ccRefClass} {Ambiant_dimension::Kernel>} +\begin{ccRefClass} {Ambient_dimension::Kernel>} \ccDefinition -The class \ccRefName\ allows to retrieve the dimension of the ambiant space of +The class \ccRefName\ allows to retrieve the dimension of the ambient space of a type. \ccInclude{CGAL/Dimension.h} @@ -16,7 +16,7 @@ It exists only when the dimension is a compile-time constant.} \ccTypedef{type;}{Either \ccc{Dimension_tag} if the dimension is a compile-time constant of value \ccc{dim}, or \ccc{Dynamic_dimension_tag} -otherwise. It is implemented as \ccc{K::Ambiant_dimension::type}. } +otherwise. It is implemented as \ccc{K::Ambient_dimension::type}. } \ccExample @@ -24,7 +24,7 @@ The following retrieves the dimension of a point type. \begin{cprog} typedef K::Point_2 Point; - int dimension = Ambiant_dimension::value; + int dimension = Ambient_dimension::value; assert(dimension == 2); \end{cprog} diff --git a/Kernel_23/doc_tex/Kernel_23_ref/Dimension_tag.tex b/Kernel_23/doc_tex/Kernel_23_ref/Dimension_tag.tex index 18659d4b29d..e3e397c8a40 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/Dimension_tag.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/Dimension_tag.tex @@ -25,7 +25,7 @@ either in 2D or in 3D. \end{cprog} \ccSeeAlso -\ccRefConceptPage{CGAL::Ambiant_dimension::Kernel>} \\ +\ccRefConceptPage{CGAL::Ambient_dimension::Kernel>} \\ \ccRefConceptPage{CGAL::Feature_dimension::Kernel>} \\ \ccRefConceptPage{Dynamic_dimension_tag} diff --git a/Kernel_23/doc_tex/Kernel_23_ref/Dynamic_dimension_tag.tex b/Kernel_23/doc_tex/Kernel_23_ref/Dynamic_dimension_tag.tex index 0dc2d2c6f6b..05c214ade73 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/Dynamic_dimension_tag.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/Dynamic_dimension_tag.tex @@ -23,7 +23,7 @@ either in 2D or in 3D. \ccSeeAlso \ccRefConceptPage{Dimension_tag} \\ -\ccRefConceptPage{CGAL::Ambiant_dimension::Kernel>} \\ +\ccRefConceptPage{CGAL::Ambient_dimension::Kernel>} \\ \ccRefConceptPage{CGAL::Feature_dimension::Kernel>} \end{ccRefClass} diff --git a/Kernel_23/doc_tex/Kernel_23_ref/Feature_dimension.tex b/Kernel_23/doc_tex/Kernel_23_ref/Feature_dimension.tex index 9c60035c67b..ba3caeb858b 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/Feature_dimension.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/Feature_dimension.tex @@ -30,6 +30,6 @@ The following retrieves the dimension of a point type. \ccSeeAlso \ccRefConceptPage{Dimension_tag} \\ \ccRefConceptPage{Dynamic_dimension_tag} \\ -\ccRefConceptPage{CGAL::Ambiant_dimension::Kernel>} +\ccRefConceptPage{CGAL::Ambient_dimension::Kernel>} \end{ccRefClass} diff --git a/Kernel_23/doc_tex/Kernel_23_ref/main.tex b/Kernel_23/doc_tex/Kernel_23_ref/main.tex index fd51a25a929..9aa25089d67 100644 --- a/Kernel_23/doc_tex/Kernel_23_ref/main.tex +++ b/Kernel_23/doc_tex/Kernel_23_ref/main.tex @@ -467,7 +467,7 @@ in the kernel. \section{Dimension handling tools} \gdef\ccRefPageBreak{\ccFalse} -\input{Kernel_23_ref/Ambiant_dimension.tex} +\input{Kernel_23_ref/Ambient_dimension.tex} \input{Kernel_23_ref/Feature_dimension.tex} \gdef\ccRefPageBreak{\ccTrue} \input{Kernel_23_ref/Dimension_tag.tex} diff --git a/Kernel_23/include/CGAL/Aff_transformation_2.h b/Kernel_23/include/CGAL/Aff_transformation_2.h index 249fc4b60de..d7c60e9a1db 100644 --- a/Kernel_23/include/CGAL/Aff_transformation_2.h +++ b/Kernel_23/include/CGAL/Aff_transformation_2.h @@ -39,7 +39,7 @@ class Aff_transformation_2 : public R_::Kernel_base::Aff_transformation_2 typedef typename R_::Kernel_base::Aff_transformation_2 RAff_transformation_2; public: - typedef CGAL::Dimension_tag<2> Ambiant_dimension; + typedef CGAL::Dimension_tag<2> Ambient_dimension; typedef R_ R; diff --git a/Kernel_23/include/CGAL/Aff_transformation_3.h b/Kernel_23/include/CGAL/Aff_transformation_3.h index 00e22f25744..bee06057427 100644 --- a/Kernel_23/include/CGAL/Aff_transformation_3.h +++ b/Kernel_23/include/CGAL/Aff_transformation_3.h @@ -35,7 +35,7 @@ class Aff_transformation_3 : public R_::Kernel_base::Aff_transformation_3 typedef typename R_::Kernel_base::Aff_transformation_3 RAff_transformation_3; public: - typedef CGAL::Dimension_tag<3> Ambiant_dimension; + typedef CGAL::Dimension_tag<3> Ambient_dimension; typedef R_ R; diff --git a/Kernel_23/include/CGAL/Bbox_2.h b/Kernel_23/include/CGAL/Bbox_2.h index 7a610db6492..20cfe8938aa 100644 --- a/Kernel_23/include/CGAL/Bbox_2.h +++ b/Kernel_23/include/CGAL/Bbox_2.h @@ -42,7 +42,7 @@ class Bbox_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<2> Feature_dimension; typedef Simple_cartesian R; diff --git a/Kernel_23/include/CGAL/Bbox_3.h b/Kernel_23/include/CGAL/Bbox_3.h index fbdf4f5f29d..e9979bbde62 100644 --- a/Kernel_23/include/CGAL/Bbox_3.h +++ b/Kernel_23/include/CGAL/Bbox_3.h @@ -39,7 +39,7 @@ class Bbox_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<3> Feature_dimension; typedef Simple_cartesian R; diff --git a/Kernel_23/include/CGAL/Circle_2.h b/Kernel_23/include/CGAL/Circle_2.h index 8ab24c6ac1c..ca86117544b 100644 --- a/Kernel_23/include/CGAL/Circle_2.h +++ b/Kernel_23/include/CGAL/Circle_2.h @@ -46,7 +46,7 @@ class Circle_2 : public R_::Kernel_base::Circle_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; typedef RCircle_2 Rep; diff --git a/Kernel_23/include/CGAL/Dimension.h b/Kernel_23/include/CGAL/Dimension.h index eec299299cc..0a776976285 100644 --- a/Kernel_23/include/CGAL/Dimension.h +++ b/Kernel_23/include/CGAL/Dimension.h @@ -50,13 +50,13 @@ namespace CGALi { } // namespace CGALi -// Ambiant_dimension gives access to the dimension of the ambiant space of an object. +// Ambient_dimension gives access to the dimension of the ambient space of an object. template < typename T, typename K = typename Kernel_traits::Kernel > -struct Ambiant_dimension - : public CGALi::Dim_value< typename K::template Ambiant_dimension::type > +struct Ambient_dimension + : public CGALi::Dim_value< typename K::template Ambient_dimension::type > { - typedef typename K::template Ambiant_dimension::type type; + typedef typename K::template Ambient_dimension::type type; }; diff --git a/Kernel_23/include/CGAL/Direction_2.h b/Kernel_23/include/CGAL/Direction_2.h index a008ba765b2..a864d445ab3 100644 --- a/Kernel_23/include/CGAL/Direction_2.h +++ b/Kernel_23/include/CGAL/Direction_2.h @@ -48,7 +48,7 @@ class Direction_2 : public R_::Kernel_base::Direction_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<0> Feature_dimension; typedef RDirection_2 Rep; diff --git a/Kernel_23/include/CGAL/Direction_3.h b/Kernel_23/include/CGAL/Direction_3.h index ebb203cbc06..776af50ceda 100644 --- a/Kernel_23/include/CGAL/Direction_3.h +++ b/Kernel_23/include/CGAL/Direction_3.h @@ -47,7 +47,7 @@ class Direction_3 : public R_::Kernel_base::Direction_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<0> Feature_dimension; typedef typename R_::Kernel_base::Direction_3 Rep; diff --git a/Kernel_23/include/CGAL/Iso_cuboid_3.h b/Kernel_23/include/CGAL/Iso_cuboid_3.h index 305ece6f8f3..7d8397064b7 100644 --- a/Kernel_23/include/CGAL/Iso_cuboid_3.h +++ b/Kernel_23/include/CGAL/Iso_cuboid_3.h @@ -44,7 +44,7 @@ class Iso_cuboid_3 : public R_::Kernel_base::Iso_cuboid_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<3> Feature_dimension; typedef typename R_::Kernel_base::Iso_cuboid_3 Rep; diff --git a/Kernel_23/include/CGAL/Iso_rectangle_2.h b/Kernel_23/include/CGAL/Iso_rectangle_2.h index 11cd16aa71a..70a6e3b2297 100644 --- a/Kernel_23/include/CGAL/Iso_rectangle_2.h +++ b/Kernel_23/include/CGAL/Iso_rectangle_2.h @@ -45,7 +45,7 @@ class Iso_rectangle_2 : public R_::Kernel_base::Iso_rectangle_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<2> Feature_dimension; typedef typename R_::Kernel_base::Iso_rectangle_2 Rep; diff --git a/Kernel_23/include/CGAL/Line_2.h b/Kernel_23/include/CGAL/Line_2.h index 88e828035f9..e97823e224d 100644 --- a/Kernel_23/include/CGAL/Line_2.h +++ b/Kernel_23/include/CGAL/Line_2.h @@ -49,7 +49,7 @@ class Line_2 : public R_::Kernel_base::Line_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; typedef RLine_2 Rep; diff --git a/Kernel_23/include/CGAL/Line_3.h b/Kernel_23/include/CGAL/Line_3.h index 0a9e4277a65..a4a89be174b 100644 --- a/Kernel_23/include/CGAL/Line_3.h +++ b/Kernel_23/include/CGAL/Line_3.h @@ -49,7 +49,7 @@ class Line_3 : public R_::Kernel_base::Line_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; typedef typename R_::Kernel_base::Line_3 Rep; diff --git a/Kernel_23/include/CGAL/Plane_3.h b/Kernel_23/include/CGAL/Plane_3.h index e07c50b55b2..53bf8431da9 100644 --- a/Kernel_23/include/CGAL/Plane_3.h +++ b/Kernel_23/include/CGAL/Plane_3.h @@ -49,7 +49,7 @@ class Plane_3 : public R_::Kernel_base::Plane_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<2> Feature_dimension; typedef typename R_::Kernel_base::Plane_3 Rep; diff --git a/Kernel_23/include/CGAL/Point_2.h b/Kernel_23/include/CGAL/Point_2.h index 99afa28758e..059983310e8 100644 --- a/Kernel_23/include/CGAL/Point_2.h +++ b/Kernel_23/include/CGAL/Point_2.h @@ -48,7 +48,7 @@ class Point_2 : public R_::Kernel_base::Point_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<0> Feature_dimension; typedef RPoint_2 Rep; diff --git a/Kernel_23/include/CGAL/Point_3.h b/Kernel_23/include/CGAL/Point_3.h index 8e02600a6fb..81ce72eb3ac 100644 --- a/Kernel_23/include/CGAL/Point_3.h +++ b/Kernel_23/include/CGAL/Point_3.h @@ -48,7 +48,7 @@ class Point_3 : public R_::Kernel_base::Point_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<0> Feature_dimension; typedef typename R_::Kernel_base::Point_3 Rep; diff --git a/Kernel_23/include/CGAL/Ray_2.h b/Kernel_23/include/CGAL/Ray_2.h index 6bb4d233f85..e31a09673f8 100644 --- a/Kernel_23/include/CGAL/Ray_2.h +++ b/Kernel_23/include/CGAL/Ray_2.h @@ -50,7 +50,7 @@ class Ray_2 : public R_::Kernel_base::Ray_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; typedef RRay_2 Rep; diff --git a/Kernel_23/include/CGAL/Ray_3.h b/Kernel_23/include/CGAL/Ray_3.h index d3138680ca3..46e9d347537 100644 --- a/Kernel_23/include/CGAL/Ray_3.h +++ b/Kernel_23/include/CGAL/Ray_3.h @@ -47,7 +47,7 @@ class Ray_3 : public R_::Kernel_base::Ray_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; typedef typename R_::Kernel_base::Ray_3 Rep; diff --git a/Kernel_23/include/CGAL/Segment_2.h b/Kernel_23/include/CGAL/Segment_2.h index f3614ff119f..1a093b98deb 100644 --- a/Kernel_23/include/CGAL/Segment_2.h +++ b/Kernel_23/include/CGAL/Segment_2.h @@ -49,7 +49,7 @@ class Segment_2 : public R_::Kernel_base::Segment_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; typedef RSegment_2 Rep; diff --git a/Kernel_23/include/CGAL/Segment_3.h b/Kernel_23/include/CGAL/Segment_3.h index d1abf85b1b5..f4ae3b16490 100644 --- a/Kernel_23/include/CGAL/Segment_3.h +++ b/Kernel_23/include/CGAL/Segment_3.h @@ -48,7 +48,7 @@ class Segment_3 : public R_::Kernel_base::Segment_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<1> Feature_dimension; typedef typename R_::Kernel_base::Segment_3 Rep; diff --git a/Kernel_23/include/CGAL/Sphere_3.h b/Kernel_23/include/CGAL/Sphere_3.h index 77521680eb3..7c875759704 100644 --- a/Kernel_23/include/CGAL/Sphere_3.h +++ b/Kernel_23/include/CGAL/Sphere_3.h @@ -45,7 +45,7 @@ class Sphere_3 : public R_::Kernel_base::Sphere_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<2> Feature_dimension; typedef typename R_::Kernel_base::Sphere_3 Rep; diff --git a/Kernel_23/include/CGAL/Tetrahedron_3.h b/Kernel_23/include/CGAL/Tetrahedron_3.h index 99d62f41262..cc1be004f75 100644 --- a/Kernel_23/include/CGAL/Tetrahedron_3.h +++ b/Kernel_23/include/CGAL/Tetrahedron_3.h @@ -43,7 +43,7 @@ class Tetrahedron_3 : public R_::Kernel_base::Tetrahedron_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<3> Feature_dimension; typedef typename R_::Kernel_base::Tetrahedron_3 Rep; diff --git a/Kernel_23/include/CGAL/Triangle_2.h b/Kernel_23/include/CGAL/Triangle_2.h index 0244dd67a6f..d2d5463b84d 100644 --- a/Kernel_23/include/CGAL/Triangle_2.h +++ b/Kernel_23/include/CGAL/Triangle_2.h @@ -44,7 +44,7 @@ class Triangle_2 : public R_::Kernel_base::Triangle_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<2> Feature_dimension; typedef RTriangle_2 Rep; diff --git a/Kernel_23/include/CGAL/Triangle_3.h b/Kernel_23/include/CGAL/Triangle_3.h index 5cda52364f1..8d39396f054 100644 --- a/Kernel_23/include/CGAL/Triangle_3.h +++ b/Kernel_23/include/CGAL/Triangle_3.h @@ -46,7 +46,7 @@ class Triangle_3 : public R_::Kernel_base::Triangle_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<2> Feature_dimension; typedef typename R_::Kernel_base::Triangle_3 Rep; diff --git a/Kernel_23/include/CGAL/Vector_2.h b/Kernel_23/include/CGAL/Vector_2.h index 33adf82d275..292bf124eb2 100644 --- a/Kernel_23/include/CGAL/Vector_2.h +++ b/Kernel_23/include/CGAL/Vector_2.h @@ -52,7 +52,7 @@ class Vector_2 : public R_::Kernel_base::Vector_2 public: - typedef Dimension_tag<2> Ambiant_dimension; + typedef Dimension_tag<2> Ambient_dimension; typedef Dimension_tag<0> Feature_dimension; typedef RVector_2 Rep; diff --git a/Kernel_23/include/CGAL/Vector_3.h b/Kernel_23/include/CGAL/Vector_3.h index 800d712cf18..98ce89f81eb 100644 --- a/Kernel_23/include/CGAL/Vector_3.h +++ b/Kernel_23/include/CGAL/Vector_3.h @@ -51,7 +51,7 @@ class Vector_3 : public R_::Kernel_base::Vector_3 public: - typedef Dimension_tag<3> Ambiant_dimension; + typedef Dimension_tag<3> Ambient_dimension; typedef Dimension_tag<0> Feature_dimension; typedef typename R_::Cartesian_const_iterator_3 Cartesian_const_iterator; diff --git a/Kernel_23/test/Kernel_23/Dimension.cpp b/Kernel_23/test/Kernel_23/Dimension.cpp index 8fde9e20ef3..06941f87ada 100644 --- a/Kernel_23/test/Kernel_23/Dimension.cpp +++ b/Kernel_23/test/Kernel_23/Dimension.cpp @@ -1,4 +1,4 @@ -// Test program for Ambiant_dimension<> and Feature_dimension<>. +// Test program for Ambient_dimension<> and Feature_dimension<>. // Sylvain Pion, 2005, 2008. #include @@ -15,18 +15,18 @@ template < typename K > void test(CGAL::Dimension_tag<2>) { - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); - assert( 2 == CGAL::Ambiant_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); + assert( 2 == CGAL::Ambient_dimension::value ); assert( 0 == CGAL::Feature_dimension::value ); assert( 0 == CGAL::Feature_dimension::value ); @@ -45,19 +45,19 @@ void test(CGAL::Dimension_tag<2>) template < typename K > void test(CGAL::Dimension_tag<3>) { - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); - assert( 3 == CGAL::Ambiant_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); + assert( 3 == CGAL::Ambient_dimension::value ); assert( 0 == CGAL::Feature_dimension::value ); assert( 2 == CGAL::Feature_dimension::value ); @@ -79,16 +79,16 @@ void check_dyn_dim(CGAL::Dynamic_dimension_tag) {} template < typename K > void test(CGAL::Dynamic_dimension_tag) { - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); - check_dyn_dim(typename CGAL::Ambiant_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); + check_dyn_dim(typename CGAL::Ambient_dimension::type() ); assert( 0 == CGAL::Feature_dimension::value ); assert( 0 == CGAL::Feature_dimension::value ); diff --git a/Kernel_d/include/CGAL/Cartesian_d.h b/Kernel_d/include/CGAL/Cartesian_d.h index a79091eb81b..5c149ec27ce 100644 --- a/Kernel_d/include/CGAL/Cartesian_d.h +++ b/Kernel_d/include/CGAL/Cartesian_d.h @@ -75,8 +75,8 @@ public: typedef typename Point_d_base::Cartesian_const_iterator Cartesian_const_iterator_d; template - struct Ambiant_dimension { - typedef typename T::Ambiant_dimension type; + struct Ambient_dimension { + typedef typename T::Ambient_dimension type; }; template diff --git a/Kernel_d/include/CGAL/Homogeneous_d.h b/Kernel_d/include/CGAL/Homogeneous_d.h index 79f3607d09c..96a660f5f1a 100644 --- a/Kernel_d/include/CGAL/Homogeneous_d.h +++ b/Kernel_d/include/CGAL/Homogeneous_d.h @@ -75,8 +75,8 @@ public: typedef typename Point_d_base::Cartesian_const_iterator Cartesian_const_iterator_d; template - struct Ambiant_dimension { - typedef typename T::Ambiant_dimension type; + struct Ambient_dimension { + typedef typename T::Ambient_dimension type; }; template diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h index 41e550107df..d9d899b127a 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h @@ -31,7 +31,7 @@ template class Aff_transformation_d : public pR::Aff_transformation_d_base { public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef typename pR::Aff_transformation_d_base Base; typedef Aff_transformation_d Self; diff --git a/Kernel_d/include/CGAL/Kernel_d/Direction_d.h b/Kernel_d/include/CGAL/Kernel_d/Direction_d.h index b197f208fdb..c29d0365e14 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Direction_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Direction_d.h @@ -32,7 +32,7 @@ template class Direction_d : public pR::Direction_d_base { public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dimension_tag<0> Feature_dimension; typedef typename pR::Direction_d_base Base; diff --git a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h index 9589a9cf025..3657c2b7841 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h @@ -33,7 +33,7 @@ class Hyperplane_d : public pR::Hyperplane_d_base { public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dynamic_dimension_tag Feature_dimension; typedef typename pR::Hyperplane_d_base Base; diff --git a/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h b/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h index 577a35e2cd2..78844a3343f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h @@ -312,7 +312,7 @@ namespace CGAL { public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dynamic_dimension_tag Feature_dimension; Iso_box_d() {} diff --git a/Kernel_d/include/CGAL/Kernel_d/Line_d.h b/Kernel_d/include/CGAL/Kernel_d/Line_d.h index afcf2a7e22b..0cb2411140f 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Line_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Line_d.h @@ -52,7 +52,7 @@ $d$-dimensional Euclidian space.}*/ public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dimension_tag<1> Feature_dimension; /*{\Mtypes 5}*/ diff --git a/Kernel_d/include/CGAL/Kernel_d/Point_d.h b/Kernel_d/include/CGAL/Kernel_d/Point_d.h index 040c5dd1c5b..5ac10159c60 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Point_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Point_d.h @@ -40,7 +40,7 @@ private: typedef typename R::LA LA; public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dimension_tag<0> Feature_dimension; Point_d(int d=0) : Base(d) {} diff --git a/Kernel_d/include/CGAL/Kernel_d/Ray_d.h b/Kernel_d/include/CGAL/Kernel_d/Ray_d.h index de2e548a8ab..cb2fa29f4a1 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Ray_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Ray_d.h @@ -54,7 +54,7 @@ it goes to infinity.}*/ public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dimension_tag<1> Feature_dimension; /*{\Mtypes 4}*/ diff --git a/Kernel_d/include/CGAL/Kernel_d/Segment_d.h b/Kernel_d/include/CGAL/Kernel_d/Segment_d.h index a2e7aa6bb3d..54651a17b4d 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Segment_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Segment_d.h @@ -56,7 +56,7 @@ the target point of $s$, both points are called endpoints of $s$. A segment whose endpoints are equal is called \emph{degenerate}.}*/ public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dimension_tag<1> Feature_dimension; /*{\Mtypes 5}*/ diff --git a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h index 06d895b2eea..3358c96ad8d 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h @@ -79,7 +79,7 @@ set of defining points to be legal. The orientation of $S$ is equal to the orientation of the defining points, i.e., |orientation(A)|. }*/ public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dynamic_dimension_tag Feature_dimension; /*{\Mtypes 4}*/ diff --git a/Kernel_d/include/CGAL/Kernel_d/Vector_d.h b/Kernel_d/include/CGAL/Kernel_d/Vector_d.h index 0bc4409f72d..5e6af76e89a 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Vector_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Vector_d.h @@ -31,7 +31,7 @@ template class Vector_d : public pR::Vector_d_base { public: - typedef CGAL::Dynamic_dimension_tag Ambiant_dimension; + typedef CGAL::Dynamic_dimension_tag Ambient_dimension; typedef CGAL::Dimension_tag<0> Feature_dimension; typedef typename pR::Vector_d_base Base; diff --git a/Principal_component_analysis/include/CGAL/barycenter.h b/Principal_component_analysis/include/CGAL/barycenter.h index 3e0d7c11669..90a709820fe 100644 --- a/Principal_component_analysis/include/CGAL/barycenter.h +++ b/Principal_component_analysis/include/CGAL/barycenter.h @@ -46,7 +46,7 @@ barycenter(InputIterator begin, InputIterator end, const K & ) typedef typename std::iterator_traits::value_type pair; typedef typename pair::second_type FT; typedef typename pair::first_type Point; - typedef typename Vector::type, K>::type Vector; + typedef typename Vector::type, K>::type Vector; CGAL_precondition(begin != end); @@ -74,7 +74,7 @@ barycenter(PointInputIterator begin, PointInputIterator end, { typedef typename std::iterator_traits::value_type Point; typedef typename std::iterator_traits::value_type FT; - typedef typename Vector::type, K>::type Vector; + typedef typename Vector::type, K>::type Vector; CGAL_precondition(begin != end); diff --git a/Principal_component_analysis/include/CGAL/bounding_box.h b/Principal_component_analysis/include/CGAL/bounding_box.h index 4f0f736fd7e..0e00780e68d 100644 --- a/Principal_component_analysis/include/CGAL/bounding_box.h +++ b/Principal_component_analysis/include/CGAL/bounding_box.h @@ -125,17 +125,17 @@ bounding_box(ForwardIterator f, ForwardIterator l, const Traits& t, Dynamic_dime template < class ForwardIterator, class K > inline -typename Iso_box +typename Iso_box ::value_type, K>::type, K >::type bounding_box(ForwardIterator f, ForwardIterator l, const K& k) { typedef typename std::iterator_traits< ForwardIterator >::value_type Pt; - return CGALi::bounding_box(f, l, k, typename Ambiant_dimension::type() ); + return CGALi::bounding_box(f, l, k, typename Ambient_dimension::type() ); } template < class ForwardIterator > inline -typename Iso_box::value_type, +typename Iso_box::value_type, typename Kernel_traits::value_type>::Kernel>::type, typename Kernel_traits::value_type>::Kernel >::type bounding_box(ForwardIterator f, ForwardIterator l) diff --git a/Principal_component_analysis/include/CGAL/centroid.h b/Principal_component_analysis/include/CGAL/centroid.h index f6a35da4b89..e4cbbb4c58b 100644 --- a/Principal_component_analysis/include/CGAL/centroid.h +++ b/Principal_component_analysis/include/CGAL/centroid.h @@ -812,7 +812,7 @@ template < typename InputIterator, typename K, typename Dim_tag > inline -typename Point::value_type, K>::type, +typename Point::value_type, K>::type, K >::type centroid(InputIterator begin, @@ -832,7 +832,7 @@ template < typename InputIterator, typename Kernel_or_Dim > struct Dispatch_centroid { typedef Kernel_or_Dim K; - typedef typename Point::value_type, K>::type, + typedef typename Point::value_type, K>::type, K >::type result_type; @@ -848,7 +848,7 @@ struct Dispatch_centroid template < typename InputIterator, int dim > struct Dispatch_centroid < InputIterator, Dimension_tag > { - typedef typename Point::value_type, typename Kernel_traits::value_type>::Kernel >::type, typename Kernel_traits::value_type>::Kernel >::type result_type; @@ -865,7 +865,7 @@ struct Dispatch_centroid < InputIterator, Dimension_tag > template < typename InputIterator > struct Dispatch_centroid { - typedef typename Point::value_type, typename Kernel_traits::value_type>::Kernel >::type, typename Kernel_traits::value_type>::Kernel >::type result_type; @@ -896,7 +896,7 @@ centroid(InputIterator begin, InputIterator end, const Kernel_or_dim& k_or_d) // and uses Kernel_traits<> to find out its kernel, and Feature_dimension for the dimension tag. template < typename InputIterator > inline -typename Point::value_type, typename Kernel_traits::value_type>::Kernel >::type, typename Kernel_traits::value_type>::Kernel >::type