From 36f0f9c7549f591b91b165f43d40f68ad33b0f36 Mon Sep 17 00:00:00 2001
From: Marc Glisse <marc.glisse@inria.fr>
Date: Wed, 30 Apr 2014 17:08:56 +0200
Subject: [PATCH] Test a few more functors.

---
 .../include/CGAL/NewKernel_d/Kernel_d_interface.h  |  3 ++-
 NewKernel_d/test/NewKernel_d/Epick_d.cpp           | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

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 ebe03027ee0..f3d35df9e84 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Kernel_d_interface.h
@@ -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<Aff_transformation_tag> >::type Construct_aff_transformation_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)
 	  int dimension(Point_d const&p){
 	    return this->kernel().point_dimension_d_object()(p);
diff --git a/NewKernel_d/test/NewKernel_d/Epick_d.cpp b/NewKernel_d/test/NewKernel_d/Epick_d.cpp
index 118b3340882..e78265e836d 100644
--- a/NewKernel_d/test/NewKernel_d/Epick_d.cpp
+++ b/NewKernel_d/test/NewKernel_d/Epick_d.cpp
@@ -163,7 +163,11 @@ void test2(){
   PoL pol Kinit(position_on_line_d_object);
 
   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* r=rr;
   P c=cp(r,r+2);
@@ -284,6 +288,7 @@ template<class CP> struct Construct_point3_helper {
 template<class Ker>
 void test3(){
   typedef Ker K1;
+  //typedef typename K1::FT FT;
   typedef typename K1::Point_d P;
   typedef typename K1::Cartesian_const_iterator_d CI;
   typedef typename K1::Vector_d V;
@@ -341,6 +346,12 @@ void test3(){
   P a; // Triangulation needs this :-(
   a=cp(2,3,4);
   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* r=rr;
   P c=cp_(3,r,r+3);
@@ -354,6 +365,7 @@ void test3(){
     std::cout << *i << ' ';
   std::cout << '\n';
   P e=cp(-2,3,0);
+  assert(fabs(sd(e,a)-32)<.0001);
   P tab[]={a,b,c,d,e};
   std::cout << po (&tab[0],tab+4) << ' ';
   std::cout << sos(&tab[0],tab+5) << ' ';