Remove \cgalModif markers.

This commit is contained in:
Marc Glisse 2014-02-02 12:52:44 +01:00
parent 7ddc45a73b
commit b9af149293
5 changed files with 15 additions and 24 deletions

View File

@ -5,13 +5,11 @@ namespace CGAL {
\ingroup PkgKernelDKernels \ingroup PkgKernelDKernels
A model for `Kernel_d` that uses %Cartesian coordinates to represent the A model for `Kernel_d` that uses %Cartesian coordinates to represent the
geometric objects. The parameter `DimensionTag` is \cgalModifBegin a tag representing\cgalModifEnd the dimension of the geometric objects. The parameter `DimensionTag` is a tag representing the dimension of the
ambient Euclidean space. It may be either `Dimension_tag<d>` \cgalModifBegin where `d` is ambient Euclidean space. It may be either `Dimension_tag<d>` where `d` is
an integer an integer
or `Dynamic_dimension_tag`. In the later case, the dimension of the space is specified for each point when it is constructed, so it doesn't need to be known at compile-time.
\cgalModifEnd or `Dynamic_dimension_tag`. \cgalModifBegin In the later case, the dimension of the space is specified for each point when it is constructed, so it doesn't need to be known at compile-time. This kernel supports construction of points from `double`
\cgalModifEnd This kernel supports construction of points from `double`
%Cartesian coordinates. It provides exact geometric predicates, but %Cartesian coordinates. It provides exact geometric predicates, but
the geometric constructions are not guaranteed to be exact. The geometric the geometric constructions are not guaranteed to be exact. The geometric
predicates are made exact without sacrificing speed thanks to the use of predicates are made exact without sacrificing speed thanks to the use of
@ -48,11 +46,9 @@ public:
\pre `DimensionTag` is a fixed dimension, not `Dynamic_dimension_tag`. */ \pre `DimensionTag` is a fixed dimension, not `Dynamic_dimension_tag`. */
Point_d(double x0, double x1, ...); Point_d(double x0, double x1, ...);
/*! \cgalModifBegin introduces a point with coordinate set `[first,end)`. /*! introduces a point with coordinate set `[first,end)`.
\pre If `DimensionTag` is a fixed dimension, it matches `distance(first,end)`. \pre If `DimensionTag` is a fixed dimension, it matches `distance(first,end)`.
\cgalRequires The value type of `InputIterator` is convertible to `double`. \cgalRequires The value type of `InputIterator` is convertible to `double`.
\cgalModifEnd
*/ */
template<typename InputIterator> template<typename InputIterator>
Point_d(InputIterator first, InputIterator end); Point_d(InputIterator first, InputIterator end);
@ -61,13 +57,9 @@ Point_d(InputIterator first, InputIterator end);
\pre `i` is non-negative and less than the dimension. */ \pre `i` is non-negative and less than the dimension. */
double operator[](int i)const; double operator[](int i)const;
/*! \cgalModifBegin returns an iterator pointing to the zeroth Cartesian coordinate. /*! returns an iterator pointing to the zeroth Cartesian coordinate. */
\cgalModifEnd */
Cartesian_const_iterator_d cartesian_begin()const; Cartesian_const_iterator_d cartesian_begin()const;
/*! \cgalModifBegin returns an iterator pointing beyond the last Cartesian coordinate. /*! returns an iterator pointing beyond the last Cartesian coordinate. */
\cgalModifEnd */
Cartesian_const_iterator_d cartesian_end()const; Cartesian_const_iterator_d cartesian_end()const;
}; };
/// @} /// @}

View File

@ -211,12 +211,10 @@ type `LinearAlgebra`.
The kernel `Epick_d<DimensionTag>`, short for Exact Predicates Inexact The kernel `Epick_d<DimensionTag>`, short for Exact Predicates Inexact
Constructions Kernel is a kernel particularly useful when the dimension of Constructions Kernel is a kernel particularly useful when the dimension of
the space is known at compile-time; \cgalModifBegin `DimensionTag` is then the space is known at compile-time; `DimensionTag` is then
`Dimension_tag<d>` where `d` is an integer representing the dimension. It `Dimension_tag<d>` where `d` is an integer representing the dimension. It
may also be used with parameter `Dynamic_dimension_tag`, in which case the may also be used with parameter `Dynamic_dimension_tag`, in which case the
dimension does not need to be known at compile-time. dimension does not need to be known at compile-time.
\cgalModifEnd
It uses a Cartesian representation and It uses a Cartesian representation and
supports construction of points from `double` coordinates. It provides exact supports construction of points from `double` coordinates. It provides exact
geometric predicates, but the geometric constructions are not guaranteed to geometric predicates, but the geometric constructions are not guaranteed to
@ -241,10 +239,8 @@ they <B>always</B> consist of:
<LI>A <I>representation class</I>, which itself may be parameterized with a <LI>A <I>representation class</I>, which itself may be parameterized with a
number type, such as `Cartesian_d<double>` or `Homogeneous_d<leda_integer>`, number type, such as `Cartesian_d<double>` or `Homogeneous_d<leda_integer>`,
where the type can be found, \cgalModifBegin except for `Epick_d<DimensionTag>` where the where the type can be found, except for `Epick_d<DimensionTag>` where the
number type is implicitly `double` number type is implicitly `double`.
\cgalModifEnd .
</OL> </OL>
\subsection Kernel_dKernelasaTraitsClass Kernel as a Traits Class \subsection Kernel_dKernelasaTraitsClass Kernel as a Traits Class

View File

@ -115,6 +115,9 @@ public:
typename boost::result_of<CCBase(Rep,int)>::type cartesian(int i)const{ typename boost::result_of<CCBase(Rep,int)>::type cartesian(int i)const{
return CCBase()(rep(),i); return CCBase()(rep(),i);
} }
typename boost::result_of<CCBase(Rep,int)>::type operator[](int i)const{
return CCBase()(rep(),i);
}
typename boost::result_of<CPI(Rep,Begin_tag)>::type cartesian_begin()const{ typename boost::result_of<CPI(Rep,Begin_tag)>::type cartesian_begin()const{
return CPI()(rep(),Begin_tag()); return CPI()(rep(),Begin_tag());

View File

@ -5,7 +5,7 @@ CGAL_INC = -I../../../Algebraic_foundations/include -I../../../STL_Extension/inc
EIGEN_INC = `pkg-config --cflags eigen3|sed -e 's/-I/-isystem/g'` -DCGAL_EIGEN3_ENABLED EIGEN_INC = `pkg-config --cflags eigen3|sed -e 's/-I/-isystem/g'` -DCGAL_EIGEN3_ENABLED
normal: normal:
g++ test.cpp -O2 -lCGAL -lboost_thread -frounding-math -Wall -Wextra -I. -lmpfr -lgmp -I../../include ${EIGEN_INC} ${CGAL_INC} -DCGAL_CFG_NO_CPP0X_COPY_N -DCGAL_CFG_NO_CPP0X_NEXT_PREV g++ test.cpp -O2 -lCGAL -lboost_thread -frounding-math -Wall -Wextra -I. -lmpfr -lgmp -I../../include ${EIGEN_INC} ${CGAL_INC} -DCGAL_CFG_NO_CPP0X_COPY_N -DCGAL_CFG_NO_CPP0X_NEXT_PREV -DCGAL_CFG_NO_CPP0X_EXPLICIT_CONVERSION_OPERATORS
./a.out ./a.out
cxx0x: cxx0x:

View File

@ -205,7 +205,7 @@ void test3(){
S s=cs(c,d); S s=cs(c,d);
std::cout << cc(a,1) << std::endl; std::cout << cc(a,1) << std::endl;
std::cout << cc(b,2) << std::endl; std::cout << cc(b,2) << std::endl;
std::cout << cc(cse(s,0),1) << std::endl; std::cout << cse(s,0)[1] << std::endl;
std::cout << cc(cse(s,1),2) << std::endl; std::cout << cc(cse(s,1),2) << std::endl;
for(CI i=ci(a);i!=ci(a,0);++i) for(CI i=ci(a);i!=ci(a,0);++i)
std::cout << *i << ' '; std::cout << *i << ' ';