mirror of https://github.com/CGAL/cgal
"Ambient" is not spelled "Ambiant" in English...
This commit is contained in:
parent
e78c6b9855
commit
55d538b335
|
|
@ -102,8 +102,8 @@ struct Cartesian_base
|
|||
Angle;
|
||||
|
||||
template <typename T>
|
||||
struct Ambiant_dimension {
|
||||
typedef typename T::Ambiant_dimension type;
|
||||
struct Ambient_dimension {
|
||||
typedef typename T::Ambient_dimension type;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 >
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ public:
|
|||
struct Base { typedef Lazy_kernel_generic_base<Exact_kernel, Approximate_kernel, E2A, Kernel2> 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 >
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@ struct Homogeneous_base
|
|||
Angle;
|
||||
|
||||
template <typename T>
|
||||
struct Ambiant_dimension {
|
||||
typedef typename T::Ambiant_dimension type;
|
||||
struct Ambient_dimension {
|
||||
typedef typename T::Ambient_dimension type;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
\begin{ccRefClass} {Ambiant_dimension<T, K = Kernel_traits<T>::Kernel>}
|
||||
\begin{ccRefClass} {Ambient_dimension<T, K = Kernel_traits<T>::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<dim>} 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<T>::type}. }
|
||||
otherwise. It is implemented as \ccc{K::Ambient_dimension<T>::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<Point, K>::value;
|
||||
int dimension = Ambient_dimension<Point, K>::value;
|
||||
assert(dimension == 2);
|
||||
\end{cprog}
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ either in 2D or in 3D.
|
|||
\end{cprog}
|
||||
|
||||
\ccSeeAlso
|
||||
\ccRefConceptPage{CGAL::Ambiant_dimension<T, K = Kernel_traits<T>::Kernel>} \\
|
||||
\ccRefConceptPage{CGAL::Ambient_dimension<T, K = Kernel_traits<T>::Kernel>} \\
|
||||
\ccRefConceptPage{CGAL::Feature_dimension<T, K = Kernel_traits<T>::Kernel>} \\
|
||||
\ccRefConceptPage{Dynamic_dimension_tag}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ either in 2D or in 3D.
|
|||
|
||||
\ccSeeAlso
|
||||
\ccRefConceptPage{Dimension_tag} \\
|
||||
\ccRefConceptPage{CGAL::Ambiant_dimension<T, K = Kernel_traits<T>::Kernel>} \\
|
||||
\ccRefConceptPage{CGAL::Ambient_dimension<T, K = Kernel_traits<T>::Kernel>} \\
|
||||
\ccRefConceptPage{CGAL::Feature_dimension<T, K = Kernel_traits<T>::Kernel>}
|
||||
|
||||
\end{ccRefClass}
|
||||
|
|
|
|||
|
|
@ -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<T, K = Kernel_traits<T>::Kernel>}
|
||||
\ccRefConceptPage{CGAL::Ambient_dimension<T, K = Kernel_traits<T>::Kernel>}
|
||||
|
||||
\end{ccRefClass}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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<double> R;
|
||||
|
|
|
|||
|
|
@ -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<double> R;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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<T>::Kernel >
|
||||
struct Ambiant_dimension
|
||||
: public CGALi::Dim_value< typename K::template Ambiant_dimension<T>::type >
|
||||
struct Ambient_dimension
|
||||
: public CGALi::Dim_value< typename K::template Ambient_dimension<T>::type >
|
||||
{
|
||||
typedef typename K::template Ambiant_dimension<T>::type type;
|
||||
typedef typename K::template Ambient_dimension<T>::type type;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 <cassert>
|
||||
|
|
@ -15,18 +15,18 @@
|
|||
template < typename K >
|
||||
void test(CGAL::Dimension_tag<2>)
|
||||
{
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Point_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Vector_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Direction_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Line_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Ray_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Segment_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Triangle_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Iso_rectangle_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Circle_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Conic_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<typename K::Aff_transformation_2>::value );
|
||||
assert( 2 == CGAL::Ambiant_dimension<CGAL::Bbox_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Point_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Vector_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Direction_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Line_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Ray_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Segment_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Triangle_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Iso_rectangle_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Circle_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Conic_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<typename K::Aff_transformation_2>::value );
|
||||
assert( 2 == CGAL::Ambient_dimension<CGAL::Bbox_2>::value );
|
||||
|
||||
assert( 0 == CGAL::Feature_dimension<typename K::Point_2>::value );
|
||||
assert( 0 == CGAL::Feature_dimension<typename K::Vector_2>::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<typename K::Point_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Plane_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Vector_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Direction_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Line_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Ray_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Segment_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Triangle_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Tetrahedron_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Iso_cuboid_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Sphere_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<typename K::Aff_transformation_3>::value );
|
||||
assert( 3 == CGAL::Ambiant_dimension<CGAL::Bbox_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Point_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Plane_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Vector_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Direction_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Line_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Ray_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Segment_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Triangle_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Tetrahedron_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Iso_cuboid_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Sphere_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<typename K::Aff_transformation_3>::value );
|
||||
assert( 3 == CGAL::Ambient_dimension<CGAL::Bbox_3>::value );
|
||||
|
||||
assert( 0 == CGAL::Feature_dimension<typename K::Point_3>::value );
|
||||
assert( 2 == CGAL::Feature_dimension<typename K::Plane_3>::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<typename K::Point_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Hyperplane_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Vector_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Direction_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Line_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Ray_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Segment_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Iso_box_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Sphere_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambiant_dimension<typename K::Aff_transformation_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Point_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Hyperplane_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Vector_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Direction_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Line_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Ray_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Segment_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Iso_box_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Sphere_d>::type() );
|
||||
check_dyn_dim(typename CGAL::Ambient_dimension<typename K::Aff_transformation_d>::type() );
|
||||
|
||||
assert( 0 == CGAL::Feature_dimension<typename K::Point_d>::value );
|
||||
assert( 0 == CGAL::Feature_dimension<typename K::Vector_d>::value );
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ public:
|
|||
typedef typename Point_d_base::Cartesian_const_iterator Cartesian_const_iterator_d;
|
||||
|
||||
template <typename T>
|
||||
struct Ambiant_dimension {
|
||||
typedef typename T::Ambiant_dimension type;
|
||||
struct Ambient_dimension {
|
||||
typedef typename T::Ambient_dimension type;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ public:
|
|||
typedef typename Point_d_base::Cartesian_const_iterator Cartesian_const_iterator_d;
|
||||
|
||||
template <typename T>
|
||||
struct Ambiant_dimension {
|
||||
typedef typename T::Ambiant_dimension type;
|
||||
struct Ambient_dimension {
|
||||
typedef typename T::Ambient_dimension type;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ template <class pR>
|
|||
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<pR> Self;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ template <class pR>
|
|||
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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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() {}
|
||||
|
|
|
|||
|
|
@ -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}*/
|
||||
|
|
|
|||
|
|
@ -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) {}
|
||||
|
|
|
|||
|
|
@ -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}*/
|
||||
|
|
|
|||
|
|
@ -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}*/
|
||||
|
|
|
|||
|
|
@ -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}*/
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ template <class pR>
|
|||
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;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ barycenter(InputIterator begin, InputIterator end, const K & )
|
|||
typedef typename std::iterator_traits<InputIterator>::value_type pair;
|
||||
typedef typename pair::second_type FT;
|
||||
typedef typename pair::first_type Point;
|
||||
typedef typename Vector<typename Ambiant_dimension<Point, K>::type, K>::type Vector;
|
||||
typedef typename Vector<typename Ambient_dimension<Point, K>::type, K>::type Vector;
|
||||
|
||||
CGAL_precondition(begin != end);
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ barycenter(PointInputIterator begin, PointInputIterator end,
|
|||
{
|
||||
typedef typename std::iterator_traits<PointInputIterator>::value_type Point;
|
||||
typedef typename std::iterator_traits<WeightInputIterator>::value_type FT;
|
||||
typedef typename Vector<typename Ambiant_dimension<Point, K>::type, K>::type Vector;
|
||||
typedef typename Vector<typename Ambient_dimension<Point, K>::type, K>::type Vector;
|
||||
|
||||
CGAL_precondition(begin != end);
|
||||
|
||||
|
|
|
|||
|
|
@ -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 Ambiant_dimension<typename std::iterator_traits<ForwardIterator>
|
||||
typename Iso_box<typename Ambient_dimension<typename std::iterator_traits<ForwardIterator>
|
||||
::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<Pt>::type() );
|
||||
return CGALi::bounding_box(f, l, k, typename Ambient_dimension<Pt>::type() );
|
||||
}
|
||||
|
||||
template < class ForwardIterator >
|
||||
inline
|
||||
typename Iso_box<typename Ambiant_dimension<typename std::iterator_traits<ForwardIterator>::value_type,
|
||||
typename Iso_box<typename Ambient_dimension<typename std::iterator_traits<ForwardIterator>::value_type,
|
||||
typename Kernel_traits<typename std::iterator_traits<ForwardIterator>::value_type>::Kernel>::type,
|
||||
typename Kernel_traits<typename std::iterator_traits<ForwardIterator>::value_type>::Kernel >::type
|
||||
bounding_box(ForwardIterator f, ForwardIterator l)
|
||||
|
|
|
|||
|
|
@ -812,7 +812,7 @@ template < typename InputIterator,
|
|||
typename K,
|
||||
typename Dim_tag >
|
||||
inline
|
||||
typename Point<typename Ambiant_dimension<typename std::iterator_traits<InputIterator>::value_type, K>::type,
|
||||
typename Point<typename Ambient_dimension<typename std::iterator_traits<InputIterator>::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<typename Ambiant_dimension<typename std::iterator_traits<InputIterator>::value_type, K>::type,
|
||||
typedef typename Point<typename Ambient_dimension<typename std::iterator_traits<InputIterator>::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<dim> >
|
||||
{
|
||||
typedef typename Point<typename Ambiant_dimension<
|
||||
typedef typename Point<typename Ambient_dimension<
|
||||
typename std::iterator_traits<InputIterator>::value_type,
|
||||
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::type,
|
||||
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::type result_type;
|
||||
|
|
@ -865,7 +865,7 @@ struct Dispatch_centroid < InputIterator, Dimension_tag<dim> >
|
|||
template < typename InputIterator >
|
||||
struct Dispatch_centroid <InputIterator, Dynamic_dimension_tag>
|
||||
{
|
||||
typedef typename Point<typename Ambiant_dimension<
|
||||
typedef typename Point<typename Ambient_dimension<
|
||||
typename std::iterator_traits<InputIterator>::value_type,
|
||||
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::type,
|
||||
typename Kernel_traits<typename std::iterator_traits<InputIterator>::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<typename Ambiant_dimension<
|
||||
typename Point<typename Ambient_dimension<
|
||||
typename std::iterator_traits<InputIterator>::value_type,
|
||||
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::type,
|
||||
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::type
|
||||
|
|
|
|||
Loading…
Reference in New Issue