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

Simplify is_one, singleton and hull.

This commit is contained in:
Marc Glisse 2018-12-27 17:58:47 +01:00
parent 03d0f5d1e0
commit 36b47688fd
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Number_types/include/CGAL/Interval_nt.h
View File

@ -1184,17 +1184,6 @@ namespace INTERN_INTERVAL_NT {
return Uncertain<bool>::indeterminate();
}
template <bool Protected>
inline
Uncertain<bool>
is_one (const Interval_nt<Protected> & d)
{
if (d.inf() > 1) return false;
if (d.sup() < 1) return false;
if (d.inf() == d.sup()) return true;
return Uncertain<bool>::indeterminate();
}
template <bool Protected>
inline
Uncertain<bool>
@ -1313,11 +1302,12 @@ class Algebraic_structure_traits< Interval_nt<B> >
}
};
// Specialized just to specify the result type
class Is_one
: public CGAL::cpp98::unary_function< Type, Boolean > {
public:
Boolean operator()( const Type& x ) const {
return INTERN_INTERVAL_NT::is_one( x );
return x == 1;
}
};
@ -1485,7 +1475,7 @@ public:
struct Singleton :public CGAL::cpp98::unary_function<Interval,bool>{
bool operator()( const Interval& a ) const {
return Lower()(a) == Upper()(a);
return a.is_point();
}
};
@ -1527,12 +1517,15 @@ public:
struct Hull :public CGAL::cpp98::binary_function<Interval,Interval,Interval>{
Interval operator()( const Interval& a, const Interval& b ) const {
#ifdef CGAL_USE_SSE2
return Interval(_mm_max_pd(a.simd(), b.simd()));
#else
BOOST_USING_STD_MAX();
BOOST_USING_STD_MIN();
return Interval(
std::make_pair(
min BOOST_PREVENT_MACRO_SUBSTITUTION (Lower()(a),b.inf()),
max BOOST_PREVENT_MACRO_SUBSTITUTION (Upper()(a),b.sup())));
-max BOOST_PREVENT_MACRO_SUBSTITUTION (-a.inf(),-b.inf()),
max BOOST_PREVENT_MACRO_SUBSTITUTION ( a.sup(), b.sup()));
#endif
}
};