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

Add equal_to, minus, multiplies to CGAL::Kernel_d with a nested result_type

This commit is contained in:
Andreas Fabri 2021-02-02 10:11:42 +00:00
parent 6511f95999
commit 4fd0e5ca31
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Kernel_d/include/CGAL/Kernel_d/Iso_box_d.h
View File

@ -32,6 +32,39 @@ namespace CGAL {
struct Begin {}; struct Begin {};
struct End {}; struct End {};
struct Cartesian_end {}; struct Cartesian_end {};
template <typename T>
struct equal_to {
typedef bool result_type;
bool operator()(const T &lhs, const T &rhs) const
{
return lhs == rhs;
}
};
template <typename T>
struct minus {
typedef bool result_type;
T operator()(const T &lhs, const T &rhs) const
{
return lhs - rhs;
}
};
template <typename T>
struct multiplies {
typedef bool result_type;
T operator()(const T &lhs, const T &rhs) const
{
return lhs * rhs;
}
};
} // namespace Kernel_d } // namespace Kernel_d
template < typename Point_, typename Functor_ > template < typename Point_, typename Functor_ >
@ -277,11 +310,11 @@ namespace CGAL {
RT volume_nominator() const RT volume_nominator() const
{ {
typedef typename CIRT::template Iterator<Point_d,std::minus<RT> >::type typedef typename CIRT::template Iterator<Point_d,Kernel_d::minus<RT> >::type
Iter; Iter;
Iter b(ptr()->upper, ptr()->lower, Begin()); Iter b(ptr()->upper, ptr()->lower, Begin());
Iter e(ptr()->upper, ptr()->lower, Cartesian_end()); Iter e(ptr()->upper, ptr()->lower, Cartesian_end());
return std::accumulate(b, e, RT(1), std::multiplies<RT>()); return std::accumulate(b, e, RT(1), Kernel_d::multiplies<RT>());
} }
RT volume_denominator() const RT volume_denominator() const
@ -373,7 +406,7 @@ public:
bool is_degenerate() const bool is_degenerate() const
{ {
typedef typename CIRT:: typedef typename CIRT::
template Iterator<Point_d,std::equal_to<RT> >::type Iter; template Iterator<Point_d,Kernel_d::equal_to<RT> >::type Iter;
// omit homogenizing coordinates // omit homogenizing coordinates
Iter e(ptr()->lower, ptr()->upper, Cartesian_end()); Iter e(ptr()->lower, ptr()->upper, Cartesian_end());
return return