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

Equal

This commit is contained in:
Monique Teillaud 2006-02-27 16:52:28 +00:00
parent e075545f86
commit e0ac2c8ab8
3 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Curved_kernel/doc_tex/Curved_kernel_ref/FunctorEqual.tex
View File

@ -14,19 +14,24 @@ An object \ccVar\ of this type must provide in addition:
\ccMemberFunction{bool operator()
(const CircularKernel::Circular_arc_point_2 &p0,
const CircularKernel::Circular_arc_point_2 &p1);}
const CircularKernel::Circular_arc_point_2 &p1);}
{For two points.}
\ccMemberFunction{bool operator()
(const CircularKernel::Circular_arc_2 &a0,
const CircularKernel::Circular_arc_2 &a1);}
const CircularKernel::Circular_arc_2 &a1);}
{For two arcs.}
\ccMemberFunction{bool operator()
(const CircularKernel::Line_arc_2 &a0,
const CircularKernel::Line_arc_2 &a1);}
const CircularKernel::Line_arc_2 &a1);}
{For two segments.}
For the sake of completeness, there must also be an
\ccc{operator()} taking a \ccc{Line_arc_2} and a
\ccc{Circular_arc_2} as arguments (in any order) that always
returns \ccc{false}.
\ccHasModels
\ccc{Circular_kernel_2::Equal_2;}

48
Curved_kernel/doc_tex/Curved_kernel_ref/FunctorsCompare.tex
View File

@ -13,15 +13,15 @@ An object \ccVar\ of this type must provide in addition:
const CircularKernel::Circular_arc_point_2 &q );}
{Compares the $x$-coordinates of $p$ and $q$.}
\ccMemberFunction{Comparison_result operator()
(const CircularKernel::Point_2 &p,
const CircularKernel::Circular_arc_point_2 &q );}
{same.}
%\ccMemberFunction{Comparison_result operator()
% (const CircularKernel::Point_2 &p,
% const CircularKernel::Circular_arc_point_2 &q );}
%{same.}
\ccMemberFunction{Comparison_result operator()
(const CircularKernel::Circular_arc_point_2 &p,
const CircularKernel::Point_2 &q );}
{same.}
%\ccMemberFunction{Comparison_result operator()
% (const CircularKernel::Circular_arc_point_2 &p,
% const CircularKernel::Point_2 &q );}
%{same.}
\ccHasModels
@ -47,15 +47,15 @@ An object \ccVar\ of this type must provide in addition:
const CircularKernel::Circular_arc_point_2 &q );}
{Compares the $y$-coordinates of $p$ and $q$.}
\ccMemberFunction{Comparison_result operator()
(const CircularKernel::Point_2 &p,
const CircularKernel::Circular_arc_point_2 &q );}
{same.}
%\ccMemberFunction{Comparison_result operator()
% (const CircularKernel::Point_2 &p,
% const CircularKernel::Circular_arc_point_2 &q );}
%{same.}
\ccMemberFunction{Comparison_result operator()
(const CircularKernel::Circular_arc_point_2 &p,
const CircularKernel::Point_2 &q );}
{same.}
%\ccMemberFunction{Comparison_result operator()
% (const CircularKernel::Circular_arc_point_2 &p,
% const CircularKernel::Point_2 &q );}
%{same.}
\ccHasModels
@ -81,15 +81,15 @@ An object \ccVar\ of this type must provide in addition:
const CircularKernel::Circular_arc_point_2 &q );}
{Compares $p$ and $q$ according to the lexicographic ordering on $x$- and $y$-coordinates.}
\ccMemberFunction{Comparison_result operator()
(const CircularKernel::Point_2 &p,
const CircularKernel::Circular_arc_point_2 &q );}
{same.}
%\ccMemberFunction{Comparison_result operator()
% (const CircularKernel::Point_2 &p,
% const CircularKernel::Circular_arc_point_2 &q );}
%{same.}
\ccMemberFunction{Comparison_result operator()
(const CircularKernel::Circular_arc_point_2 &p,
const CircularKernel::Point_2 &q );}
{same.}
%\ccMemberFunction{Comparison_result operator()
% (const CircularKernel::Circular_arc_point_2 &p,
% const CircularKernel::Point_2 &q );}
%{same.}
\ccHasModels

3
Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h
View File

@ -78,6 +78,7 @@ namespace CircularFunctors {
typedef CGAL::Comparison_result result_type;
typedef Arity_tag<2> Arity;
using CK::Linear_kernel::Compare_y_2::operator();
result_type
operator() (const Circular_arc_point_2 &p0,
const Circular_arc_point_2 &p1) const
@ -102,11 +103,11 @@ namespace CircularFunctors {
typedef typename CK::Circular_arc_point_2 Circular_arc_point_2;
typedef typename CK::Point_2 Point_2;
public:
typedef CGAL::Comparison_result result_type;
typedef Arity_tag<2> Arity;
using CK::Linear_kernel::Compare_xy_2::operator();
result_type
operator() (const Circular_arc_point_2 &p0,
const Circular_arc_point_2 &p1) const