songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test a few more functors.

This commit is contained in:
Marc Glisse 2014-04-30 17:08:56 +02:00
parent a43fb1ef4f
commit 36f0f9c754
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
View File

@ -62,7 +62,8 @@ template <class Base_> struct Kernel_d_interface : public Base_ {
typedef typename Get_functor<Base, Construct_ttag<Iso_box_tag> >::type Construct_iso_box_d; typedef typename Get_functor<Base, Construct_ttag<Iso_box_tag> >::type Construct_iso_box_d;
typedef typename Get_functor<Base, Construct_ttag<Aff_transformation_tag> >::type Construct_aff_transformation_d; typedef typename Get_functor<Base, Construct_ttag<Aff_transformation_tag> >::type Construct_aff_transformation_d;
typedef typename Get_functor<Base, Midpoint_tag>::type Midpoint_d; typedef typename Get_functor<Base, Midpoint_tag>::type Midpoint_d;
struct Component_accessor_d : private Store_kernel<R_> { struct Component_accessor_d : private Store_kernel<Kernel> {
typedef Kernel R_; // for the macro
CGAL_FUNCTOR_INIT_STORE(Component_accessor_d) CGAL_FUNCTOR_INIT_STORE(Component_accessor_d)
int dimension(Point_d const&p){ int dimension(Point_d const&p){
return this->kernel().point_dimension_d_object()(p); return this->kernel().point_dimension_d_object()(p);

14
NewKernel_d/test/NewKernel_d/Epick_d.cpp
View File

@ -163,7 +163,11 @@ void test2(){
PoL pol Kinit(position_on_line_d_object); PoL pol Kinit(position_on_line_d_object);
P a=cp(3,4); P a=cp(3,4);
P b=cp(5,6,7); assert(pv(a)[1]==4);
P b=vp(cv(5,6,7));
assert(fabs(b[0]-5./7)<.0001);
assert(lc(b,a,1));
assert(!lc(a,b,0));
int rr[]={3,5,2}; int rr[]={3,5,2};
int* r=rr; int* r=rr;
P c=cp(r,r+2); P c=cp(r,r+2);
@ -284,6 +288,7 @@ template<class CP> struct Construct_point3_helper {
template<class Ker> template<class Ker>
void test3(){ void test3(){
typedef Ker K1; typedef Ker K1;
//typedef typename K1::FT FT;
typedef typename K1::Point_d P; typedef typename K1::Point_d P;
typedef typename K1::Cartesian_const_iterator_d CI; typedef typename K1::Cartesian_const_iterator_d CI;
typedef typename K1::Vector_d V; typedef typename K1::Vector_d V;
@ -341,6 +346,12 @@ void test3(){
P a; // Triangulation needs this :-( P a; // Triangulation needs this :-(
a=cp(2,3,4); a=cp(2,3,4);
P b=cp(5,6,7,8); P b=cp(5,6,7,8);
assert(ed(a,a));
assert(!ed(a,b));
assert(ca.dimension(a)==3);
assert(ca.cartesian(a,1)==3);
assert(ca.homogeneous(a,1)==3);
assert(ca.homogeneous(a,3)==1);
int rr[]={3,5,2,3}; int rr[]={3,5,2,3};
int* r=rr; int* r=rr;
P c=cp_(3,r,r+3); P c=cp_(3,r,r+3);
@ -354,6 +365,7 @@ void test3(){
std::cout << *i << ' '; std::cout << *i << ' ';
std::cout << '\n'; std::cout << '\n';
P e=cp(-2,3,0); P e=cp(-2,3,0);
assert(fabs(sd(e,a)-32)<.0001);
P tab[]={a,b,c,d,e}; P tab[]={a,b,c,d,e};
std::cout << po (&tab[0],tab+4) << ' '; std::cout << po (&tab[0],tab+4) << ' ';
std::cout << sos(&tab[0],tab+5) << ' '; std::cout << sos(&tab[0],tab+5) << ' ';