- Remove Compare_distance_to_point_[23].

Old_Packages/Doc23/changes.txt

@@ -1,3 +1,6 @@
+2.23    (30 May 2001)
+- Remove Compare_distance_to_point_[23].
+
 2.22    (29 May 2001)
 - Fix typo "Cricle".
 - Add Compare_distance_[23].

Old_Packages/Doc23/doc_tex/kernel/Ref/Kernel.tex

@@ -167,8 +167,6 @@ If the result type is a number type, the prefix is \ccc{Compute_}:
 \ccGlue
 \ccNestedType{Compare_distance_2}{}
 \ccGlue
-\ccNestedType{Compare_distance_to_point_2}{}
-\ccGlue
 \ccNestedType{Less_signed_distance_to_line_2}{}
 \ccGlue
 \ccNestedType{Less_rotate_ccw_2}{}
@@ -377,8 +375,6 @@ If the result type is a number type, the prefix is \ccc{Compute_}:
 \ccGlue
 \ccNestedType{Compare_distance_3}{}
 \ccGlue
-\ccNestedType{Compare_distance_to_point_3}{}
-\ccGlue
 \ccNestedType{Collinear_3}{}
 \ccGlue
 \ccNestedType{Coplanar_3}{}
@@ -549,8 +545,6 @@ an \ccc{_object} suffix.
 \ccGlue
 \ccMemberFunction{Kernel::Compare_distance_2 compare_distance_2_object() const ;}{}
 \ccGlue
-\ccMemberFunction{Kernel::Compare_distance_to_point_2 compare_distance_to_point_2_object(const Kernel::Point_2& p) const ;}{}
-\ccGlue
 \ccMemberFunction{Kernel::Less_distance_to_point_2 less_distance_to_point_2_object(const Kernel::Point_2& p) const ;}{}
 \ccGlue
 \ccMemberFunction{Kernel::Less_signed_distance_to_line_2 less_signed_distance_to_line_2_object(const Kernel::Point_2& p, const Kernel::Point_2& q) const ;}{}
@@ -725,8 +719,6 @@ an \ccc{_object} suffix.
 \ccGlue
 \ccMemberFunction{Kernel::Compare_distance_3 compare_distance_3_object() const ;}{}
 \ccGlue
-\ccMemberFunction{Kernel::Compare_distance_to_point_3 compare_distance_to_point_3_object(const Kernel::Point_3& p) const ;}{}
-\ccGlue
 \ccMemberFunction{Kernel::Collinear_3 collinear_3_object() const ;}{}
 \ccGlue
 \ccMemberFunction{Kernel::Coplanar_3 coplanar_3_object() const ;}{}

Old_Packages/Doc23/doc_tex/kernel/Ref/Kernel_Compare_distance_to_point_2.tex

@@ -1,13 +0,0 @@
-\begin{ccRefFunctionObjectConcept}{Kernel::Compare_distance_to_point_2}
-A model for this must provide:
-
-\ccCreationVariable{fo}
-
-\ccConstructor{Kernel::Compare_distance_to_point_2(const Kernel::Point_2& p);}
-{}
-
-\ccMemberFunction{Comparison_result operator()(const Kernel::Point_2&q, 
-                                               const Kernel::Point_2&r);}
-      {compares the distances of points \ccc{q} and \ccc{r} to point \ccc{p}}
-
-\end{ccRefFunctionObjectConcept}

Old_Packages/Doc23/doc_tex/kernel/Ref/Kernel_Compare_distance_to_point_3.tex

@@ -1,13 +0,0 @@
-\begin{ccRefFunctionObjectConcept}{Kernel::Compare_distance_to_point_3}
-A model for this must provide:
-
-\ccCreationVariable{fo}
-
-\ccConstructor{Kernel::Compare_distance_to_point_3(const Kernel::Point_3& p);}
-{}
-
-\ccMemberFunction{Comparison_result operator()(const Kernel::Point_3&q, 
-                                               const Kernel::Point_3&r);}
-      {compares the distances of points \ccc{q} and \ccc{r} to point \ccc{p}}
-
-\end{ccRefFunctionObjectConcept}

Old_Packages/Doc23/doc_tex/kernel/main.tex

@@ -173,10 +173,6 @@
 \KernelRefLayout
 \input{Ref/Kernel_Compare_distance_3.tex} %ck
 \KernelRefLayout
-\input{Ref/Kernel_Compare_distance_to_point_2.tex} %ck
-\KernelRefLayout
-\input{Ref/Kernel_Compare_distance_to_point_3.tex} %ck
-\KernelRefLayout
 \input{Ref/Kernel_Compare_x_2.tex} %ck
 \KernelRefLayout
 \input{Ref/Kernel_Compare_x_3.tex} %ck

Old_Packages/Kernel_basic/changes.txt

@@ -1,3 +1,6 @@
+3.39   (30 May 2001)
+- Remove Compare_distance_to_point_[23].
+
 3.38   (29 May 2001)
 - Add Compare_distance_[23].
 

Old_Packages/Kernel_basic/include/CGAL/Kernel/function_objects.h

@@ -856,21 +856,6 @@ class Compare_x_at_y
     { return compare_x_at_y(a1,a2,a3,a4); }
 };
 
-template <class T>
-class Compare_distance_to_point
-{
-  public:
-    typedef Comparison_result           result_type;
-
-    Compare_distance_to_point(const T& cp) : p(cp) {}
-
-    Comparison_result
-    operator()(const T& q, const T& r) const
-    { return cmp_dist_to_point(p,q,r); }
-
-    T  p;
-};
-
 template <class T>
 class Compare_distance
 {

Old_Packages/Kernel_basic/include/CGAL/Kernel_traits_common.h

@@ -160,11 +160,6 @@ CGAL_Kernel_obj(Compare_y_at_x_2, compare_y_at_x_2_object)
 CGAL_Kernel_obj(Compare_x_at_y_2, compare_x_at_y_2_object)
 CGAL_Kernel_obj(Compare_distance_2, compare_distance_2_object)
 
-typedef CGALi::Compare_distance_to_point<Point_2>  Compare_distance_to_point_2;
-Compare_distance_to_point_2
-compare_distance_to_point_2_object(const Point_2& p) const
-{ return Compare_distance_to_point_2(p); }
-
 typedef CGAL ::p_Less_dist_to_point<Point_2>       Less_distance_to_point_2;
 Less_distance_to_point_2
 less_distance_to_point_2_object(const Point_2& p) const  // XXX
@@ -392,12 +387,6 @@ Less_signed_distance_to_plane_3
 less_signed_distance_to_plane_3_object() const
 { return Less_signed_distance_to_plane_3(); }
 
-typedef CGALi::Compare_distance_to_point<Point_3> Compare_distance_to_point_3;
-Compare_distance_to_point_3
-compare_distance_to_point_3_object(const Point_3& p) const
-{ return Compare_distance_to_point_3(p); }
-
-
 typedef CGALi::p_Angle                                 Angle_3;
 typedef CGALi::Collinear                               Collinear_3;
 typedef CGALi::Coplanar                                Coplanar_3 ;

Old_Packages/Kernel_test/changes.txt

@@ -1,3 +1,6 @@
+3.23   (30 May 2001)
+- Remove Compare_distance_to_point_[23].
+
 3.22   (29 May 2001)
 - Add Compare_distance_[23].
 

Old_Packages/Kernel_test/test/Kernel/include/CGAL/_test_fctobj_point_line_2.C

@@ -174,23 +174,6 @@ _test_fctobj_point_line_2(const Point&, const Line& )
  
   std::cout << '.';
  
-  CGAL::Compare_distance_to_point_2< Point>  cmp_dist_to_point_p3(p3);
-  assert( cmp_dist_to_point_p3(p2,p1) == CGAL::LARGER );
- 
-  CGAL::Compare_distance_to_point_2< Point>  cmp_dist_to_point_p1(p1);
-  assert( cmp_dist_to_point_p1(p5,p1) == CGAL::LARGER );
- 
-  CGAL::Compare_distance_to_point_2< Point>  cmp_dist_to_point_p4(p4);
-  assert( cmp_dist_to_point_p4(p6,p5) == CGAL::SMALLER );
-  assert( cmp_dist_to_point_p4(p9,p1) == CGAL::SMALLER );
- 
-  CGAL::Compare_distance_to_point_2< Point>  cmp_dist_to_point_p8(p8);
-  assert( cmp_dist_to_point_p8(p3,p3) == CGAL::EQUAL );
- 
-  CGAL::Compare_distance_to_point_2< Point>  cmp_dist_to_point_p2(p2);
-  assert( cmp_dist_to_point_p2(p3,p3) == CGAL::EQUAL );
-  assert( cmp_dist_to_point_p2(p4,p9) == CGAL::LARGER );
- 
   CGAL::Less_distance_to_point_2< Point>     has_smaller_dist_to_point_p4(p4);
   assert( has_smaller_dist_to_point_p4(p9,p1) );
   assert( has_smaller_dist_to_point_p4(p6,p5) );

Old_Packages/Kernel_test/test/Kernel/include/CGAL/_test_new_2.h

@@ -365,13 +365,9 @@ test_new_2(const R& rep)
         = rep.less_distance_to_point_2_object(p2);
   bool tmp35 = less_distance_to_point(p3,p4);
 
-  typename R::Compare_distance_to_point_2 compare_dist_to_point
-        = rep.compare_distance_to_point_2_object(p2);
-  Comparison_result tmp34ab = compare_dist_to_point(p2,p3);
-
   typename R::Compare_distance_2 compare_dist
         = rep.compare_distance_2_object();
-  Comparison_result tmp34abc = compare_dist(p1,p2,p3);
+  Comparison_result tmp34ab = compare_dist(p1,p2,p3);
 
   typename R::Less_signed_distance_to_line_2 less_signed_distance_to_line
         = rep.less_signed_distance_to_line_2_object(p4,p5);
@@ -511,7 +507,7 @@ test_new_2(const R& rep)
   use(tmp34c); use(tmp34b); use(tmp34a); use(tmp32d); use(tmp32c); use(tmp32b);
   use(tmp32a); use(tmp31d); use(tmp31c); use(tmp31b); use(tmp31a); use(tmp30);
   use(tmp26); use(tmp25); use(tmp24);
-  use(tmp29); use(tmp28); use(tmp27); use(tmp33a); use(tmp34ab); use(tmp34abc);
+  use(tmp29); use(tmp28); use(tmp27); use(tmp33a); use(tmp34ab);
   use(tmp34dd); use(tmp34cc); use(tmp34bb); use(tmp34aa); 
   use(tmp39a); use(tmp36a);
   use(tmp_bool);

Old_Packages/Kernel_test/test/Kernel/include/CGAL/_test_new_3.h

@@ -396,13 +396,9 @@ test_new_3(const R& rep)
         = rep.less_signed_distance_to_plane_3_object();
   bool tmp28a = less_signed_distance_to_plane(tmp8,p2,p3);
 
-  typename R::Compare_distance_to_point_3 compare_dist_to_point
-        = rep.compare_distance_to_point_3_object(p2);
-  Comparison_result tmp34ab = compare_dist_to_point(p3,p4);
-
   typename R::Compare_distance_3 compare_dist
         = rep.compare_distance_3_object();
-  Comparison_result tmp34abc = compare_dist(p2,p3,p4);
+  Comparison_result tmp34ab = compare_dist(p2,p3,p4);
 
   typename R::Collinear_3 collinear
         = rep.collinear_3_object();
@@ -516,7 +512,7 @@ test_new_3(const R& rep)
   use(tmp29); use(tmp27); use(tmp25); use(tmp24); use(tmp23); use(tmp22);
   use(tmp15); use(tmp14); use(tmp13); use(tmp12b); use(tmp12a);
   use(tmp16); use(tmp17); use(tmp18); use(tmp19); use(tmp20); use(tmp21);
-  use(tmp26); use(tmp28); use(tmp30a); use(tmp30b); use(tmp34ab); use(tmp34abc);
+  use(tmp26); use(tmp28); use(tmp30a); use(tmp30b); use(tmp34ab);
 
   return true;
 }

Packages/Kernel_23/doc_tex/kernel/Ref/Kernel.tex

@@ -167,8 +167,6 @@ If the result type is a number type, the prefix is \ccc{Compute_}:
 \ccGlue
 \ccNestedType{Compare_distance_2}{}
 \ccGlue
-\ccNestedType{Compare_distance_to_point_2}{}
-\ccGlue
 \ccNestedType{Less_signed_distance_to_line_2}{}
 \ccGlue
 \ccNestedType{Less_rotate_ccw_2}{}
@@ -377,8 +375,6 @@ If the result type is a number type, the prefix is \ccc{Compute_}:
 \ccGlue
 \ccNestedType{Compare_distance_3}{}
 \ccGlue
-\ccNestedType{Compare_distance_to_point_3}{}
-\ccGlue
 \ccNestedType{Collinear_3}{}
 \ccGlue
 \ccNestedType{Coplanar_3}{}
@@ -549,8 +545,6 @@ an \ccc{_object} suffix.
 \ccGlue
 \ccMemberFunction{Kernel::Compare_distance_2 compare_distance_2_object() const ;}{}
 \ccGlue
-\ccMemberFunction{Kernel::Compare_distance_to_point_2 compare_distance_to_point_2_object(const Kernel::Point_2& p) const ;}{}
-\ccGlue
 \ccMemberFunction{Kernel::Less_distance_to_point_2 less_distance_to_point_2_object(const Kernel::Point_2& p) const ;}{}
 \ccGlue
 \ccMemberFunction{Kernel::Less_signed_distance_to_line_2 less_signed_distance_to_line_2_object(const Kernel::Point_2& p, const Kernel::Point_2& q) const ;}{}
@@ -725,8 +719,6 @@ an \ccc{_object} suffix.
 \ccGlue
 \ccMemberFunction{Kernel::Compare_distance_3 compare_distance_3_object() const ;}{}
 \ccGlue
-\ccMemberFunction{Kernel::Compare_distance_to_point_3 compare_distance_to_point_3_object(const Kernel::Point_3& p) const ;}{}
-\ccGlue
 \ccMemberFunction{Kernel::Collinear_3 collinear_3_object() const ;}{}
 \ccGlue
 \ccMemberFunction{Kernel::Coplanar_3 coplanar_3_object() const ;}{}

Packages/Kernel_23/doc_tex/kernel/main.tex

@@ -173,10 +173,6 @@
 \KernelRefLayout
 \input{Ref/Kernel_Compare_distance_3.tex} %ck
 \KernelRefLayout
-\input{Ref/Kernel_Compare_distance_to_point_2.tex} %ck
-\KernelRefLayout
-\input{Ref/Kernel_Compare_distance_to_point_3.tex} %ck
-\KernelRefLayout
 \input{Ref/Kernel_Compare_x_2.tex} %ck
 \KernelRefLayout
 \input{Ref/Kernel_Compare_x_3.tex} %ck

Packages/Kernel_23/include/CGAL/Kernel/function_objects.h

@@ -856,21 +856,6 @@ class Compare_x_at_y
     { return compare_x_at_y(a1,a2,a3,a4); }
 };
 
-template <class T>
-class Compare_distance_to_point
-{
-  public:
-    typedef Comparison_result           result_type;
-
-    Compare_distance_to_point(const T& cp) : p(cp) {}
-
-    Comparison_result
-    operator()(const T& q, const T& r) const
-    { return cmp_dist_to_point(p,q,r); }
-
-    T  p;
-};
-
 template <class T>
 class Compare_distance
 {

Packages/Kernel_23/test/Kernel/include/CGAL/_test_new_2.h

@@ -365,13 +365,9 @@ test_new_2(const R& rep)
         = rep.less_distance_to_point_2_object(p2);
   bool tmp35 = less_distance_to_point(p3,p4);
 
-  typename R::Compare_distance_to_point_2 compare_dist_to_point
-        = rep.compare_distance_to_point_2_object(p2);
-  Comparison_result tmp34ab = compare_dist_to_point(p2,p3);
-
   typename R::Compare_distance_2 compare_dist
         = rep.compare_distance_2_object();
-  Comparison_result tmp34abc = compare_dist(p1,p2,p3);
+  Comparison_result tmp34ab = compare_dist(p1,p2,p3);
 
   typename R::Less_signed_distance_to_line_2 less_signed_distance_to_line
         = rep.less_signed_distance_to_line_2_object(p4,p5);
@@ -511,7 +507,7 @@ test_new_2(const R& rep)
   use(tmp34c); use(tmp34b); use(tmp34a); use(tmp32d); use(tmp32c); use(tmp32b);
   use(tmp32a); use(tmp31d); use(tmp31c); use(tmp31b); use(tmp31a); use(tmp30);
   use(tmp26); use(tmp25); use(tmp24);
-  use(tmp29); use(tmp28); use(tmp27); use(tmp33a); use(tmp34ab); use(tmp34abc);
+  use(tmp29); use(tmp28); use(tmp27); use(tmp33a); use(tmp34ab);
   use(tmp34dd); use(tmp34cc); use(tmp34bb); use(tmp34aa); 
   use(tmp39a); use(tmp36a);
   use(tmp_bool);

Packages/Kernel_23/test/Kernel/include/CGAL/_test_new_3.h

@@ -396,13 +396,9 @@ test_new_3(const R& rep)
         = rep.less_signed_distance_to_plane_3_object();
   bool tmp28a = less_signed_distance_to_plane(tmp8,p2,p3);
 
-  typename R::Compare_distance_to_point_3 compare_dist_to_point
-        = rep.compare_distance_to_point_3_object(p2);
-  Comparison_result tmp34ab = compare_dist_to_point(p3,p4);
-
   typename R::Compare_distance_3 compare_dist
         = rep.compare_distance_3_object();
-  Comparison_result tmp34abc = compare_dist(p2,p3,p4);
+  Comparison_result tmp34ab = compare_dist(p2,p3,p4);
 
   typename R::Collinear_3 collinear
         = rep.collinear_3_object();
@@ -516,7 +512,7 @@ test_new_3(const R& rep)
   use(tmp29); use(tmp27); use(tmp25); use(tmp24); use(tmp23); use(tmp22);
   use(tmp15); use(tmp14); use(tmp13); use(tmp12b); use(tmp12a);
   use(tmp16); use(tmp17); use(tmp18); use(tmp19); use(tmp20); use(tmp21);
-  use(tmp26); use(tmp28); use(tmp30a); use(tmp30b); use(tmp34ab); use(tmp34abc);
+  use(tmp26); use(tmp28); use(tmp30a); use(tmp30b); use(tmp34ab);
 
   return true;
 }