From 86de7491fd961811c99da814e17fa1529e8b5dbe Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Thu, 11 Sep 2014 17:56:05 +0200 Subject: [PATCH] Difference_of_points_d. --- NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h | 2 ++ NewKernel_d/test/NewKernel_d/Epick_d.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h index 4a76b764413..7c47c032b12 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h @@ -72,6 +72,7 @@ template struct Kernel_d_interface : public Base_ { typedef typename Get_functor::type Vector_to_point_d; typedef typename Get_functor::type Scaled_vector_d; typedef typename Get_functor::type Difference_of_vectors_d; + typedef typename Get_functor::type Difference_of_points_d; typedef typename Get_functor >::type Construct_point_d; typedef typename Get_functor >::type Construct_vector_d; typedef typename Get_functor >::type Construct_segment_d; @@ -176,6 +177,7 @@ template struct Kernel_d_interface : public Base_ { Vector_to_point_d vector_to_point_d_object()const{ return Vector_to_point_d(*this); } Scaled_vector_d scaled_vector_d_object()const{ return Scaled_vector_d(*this); } Difference_of_vectors_d difference_of_vectors_d_object()const{ return Difference_of_vectors_d(*this); } + Difference_of_points_d difference_of_points_d_object()const{ return Difference_of_points_d(*this); } Affine_rank_d affine_rank_d_object()const{ return Affine_rank_d(*this); } Affinely_independent_d affinely_independent_d_object()const{ return Affinely_independent_d(*this); } Linear_base_d linear_base_d_object()const{ return Linear_base_d(*this); } diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp index 883d96da0db..c7471cf54e0 100644 --- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp +++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp @@ -118,6 +118,7 @@ void test2(){ typedef typename K1::Squared_length_d SL; typedef typename K1::Scalar_product_d SP; typedef typename K1::Difference_of_vectors_d DV; + typedef typename K1::Difference_of_points_d DP; CGAL_USE_TYPE(AT); CGAL_USE_TYPE(D); @@ -174,6 +175,7 @@ void test2(){ SL sl Kinit(squared_length_d_object); SP spr Kinit(scalar_product_d_object); DV dv Kinit(difference_of_vectors_d_object); + DP dp Kinit(difference_of_points_d_object); CGAL_USE(bc); CGAL_USE(pol); @@ -233,6 +235,7 @@ void test2(){ P x4=cp(0,0); P x5=cp(0,-1); P tab2[]={x1,x2,x3,x4}; + assert(dp(x1,x2)[1]==2); assert(po(tab2+0,tab2+3)==CGAL::COUNTERCLOCKWISE); assert(sos(tab2+0,tab2+3,x4)==CGAL::ON_POSITIVE_SIDE); assert(sbs(tab2+0,tab2+3,x4)==CGAL::ON_BOUNDED_SIDE);