diff --git a/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h b/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h index 4e28274a2a2..44d1d423057 100644 --- a/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h +++ b/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h @@ -5,13 +5,11 @@ namespace CGAL { \ingroup PkgKernelDKernels 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 -ambient Euclidean space. It may be either `Dimension_tag` \cgalModifBegin where `d` is +geometric objects. The parameter `DimensionTag` is a tag representing the dimension of the +ambient Euclidean space. It may be either `Dimension_tag` where `d` is an integer - -\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. - -\cgalModifEnd This kernel supports construction of points from `double` +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. +This kernel supports construction of points from `double` %Cartesian coordinates. It provides exact geometric predicates, but the geometric constructions are not guaranteed to be exact. The geometric 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`. */ 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)`. \cgalRequires The value type of `InputIterator` is convertible to `double`. - - \cgalModifEnd */ template 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. */ double operator[](int i)const; -/*! \cgalModifBegin returns an iterator pointing to the zeroth Cartesian coordinate. - - \cgalModifEnd */ +/*! returns an iterator pointing to the zeroth Cartesian coordinate. */ Cartesian_const_iterator_d cartesian_begin()const; -/*! \cgalModifBegin returns an iterator pointing beyond the last Cartesian coordinate. - - \cgalModifEnd */ +/*! returns an iterator pointing beyond the last Cartesian coordinate. */ Cartesian_const_iterator_d cartesian_end()const; }; /// @} diff --git a/Kernel_d/doc/Kernel_d/Kernel_d.txt b/Kernel_d/doc/Kernel_d/Kernel_d.txt index 6600f9802ad..347827cb937 100644 --- a/Kernel_d/doc/Kernel_d/Kernel_d.txt +++ b/Kernel_d/doc/Kernel_d/Kernel_d.txt @@ -211,12 +211,10 @@ type `LinearAlgebra`. The kernel `Epick_d`, short for Exact Predicates Inexact 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` where `d` is an integer representing the dimension. It may also be used with parameter `Dynamic_dimension_tag`, in which case the dimension does not need to be known at compile-time. - -\cgalModifEnd It uses a Cartesian representation and supports construction of points from `double` coordinates. It provides exact geometric predicates, but the geometric constructions are not guaranteed to @@ -241,10 +239,8 @@ they always consist of:
  • A representation class, which itself may be parameterized with a number type, such as `Cartesian_d` or `Homogeneous_d`, -where the type can be found, \cgalModifBegin except for `Epick_d` where the -number type is implicitly `double` - -\cgalModifEnd . +where the type can be found, except for `Epick_d` where the +number type is implicitly `double`. \subsection Kernel_dKernelasaTraitsClass Kernel as a Traits Class diff --git a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Point_d.h b/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Point_d.h index cb7b4a90c28..19935ddd866 100644 --- a/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Point_d.h +++ b/NewKernel_d/include/CGAL/Kernel_d/Wrapper/Point_d.h @@ -115,6 +115,9 @@ public: typename boost::result_of::type cartesian(int i)const{ return CCBase()(rep(),i); } + typename boost::result_of::type operator[](int i)const{ + return CCBase()(rep(),i); + } typename boost::result_of::type cartesian_begin()const{ return CPI()(rep(),Begin_tag()); diff --git a/NewKernel_d/test/NewKernel_d/Makefile b/NewKernel_d/test/NewKernel_d/Makefile index 0a6cbe80189..aedeff11449 100644 --- a/NewKernel_d/test/NewKernel_d/Makefile +++ b/NewKernel_d/test/NewKernel_d/Makefile @@ -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 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 cxx0x: diff --git a/NewKernel_d/test/NewKernel_d/test.cpp b/NewKernel_d/test/NewKernel_d/test.cpp index 74042308c19..3b5c6e55dcb 100644 --- a/NewKernel_d/test/NewKernel_d/test.cpp +++ b/NewKernel_d/test/NewKernel_d/test.cpp @@ -205,7 +205,7 @@ void test3(){ S s=cs(c,d); std::cout << cc(a,1) << 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; for(CI i=ci(a);i!=ci(a,0);++i) std::cout << *i << ' ';