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

Add a couple of handy functions: 

bool are_sorted(const T & a, const T & b, const T & c)
  bool are_strictly_sorted(const T & a, const T & b, const T & c)
  bool are_ordered(const T & a, const T & b, const T & c)
  bool are_strictly_ordered(const T & a, const T & b, const T & c)
This commit is contained in:
Sylvain Pion 2008-08-12 12:43:20 +00:00
parent 5c5f891fa5
commit c1389c006d
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h
View File

@ -25,6 +25,7 @@
#ifndef CGAL_PREDICATES_KERNEL_FTC2_H #ifndef CGAL_PREDICATES_KERNEL_FTC2_H
#define CGAL_PREDICATES_KERNEL_FTC2_H #define CGAL_PREDICATES_KERNEL_FTC2_H
#include <CGAL/algorithm.h>
#include <CGAL/number_utils.h> #include <CGAL/number_utils.h>
#include <CGAL/predicates/sign_of_determinant.h> #include <CGAL/predicates/sign_of_determinant.h>
#include <CGAL/constructions/kernel_ftC2.h> #include <CGAL/constructions/kernel_ftC2.h>
@ -195,7 +196,7 @@ compare_y_at_xC2(const FT &px, const FT &py,
// compares the y-coordinates of p and the vertical projection of p on s. // compares the y-coordinates of p and the vertical projection of p on s.
// Precondition : p is in the x-range of s. // Precondition : p is in the x-range of s.
CGAL_kernel_precondition(px >= (CGAL::min)(ssx, stx) && px <= (CGAL::max)(ssx, stx)); CGAL_kernel_precondition(are_ordered(ssx, px, stx));
if (ssx < stx) if (ssx < stx)
return orientationC2(px, py, ssx, ssy, stx, sty); return orientationC2(px, py, ssx, ssy, stx, sty);
@ -225,8 +226,8 @@ compare_y_at_x_segment_C2(const FT &px,
// - if the segments intersect, return EQUAL // - if the segments intersect, return EQUAL
// - if not, return the obvious SMALLER/LARGER. // - if not, return the obvious SMALLER/LARGER.
CGAL_kernel_precondition(px >= (CGAL::min)(s1sx, s1tx) && px <= (CGAL::max)(s1sx, s1tx)); CGAL_kernel_precondition(are_ordered(s1sx, px, s1tx));
CGAL_kernel_precondition(px >= (CGAL::min)(s2sx, s2tx) && px <= (CGAL::max)(s2sx, s2tx)); CGAL_kernel_precondition(are_ordered(s2sx, px, s2tx));
if (s1sx != s1tx && s2sx != s2tx) { if (s1sx != s1tx && s2sx != s2tx) {
FT s1stx = s1sx-s1tx; FT s1stx = s1sx-s1tx;

40
STL_Extension/include/CGAL/algorithm.h
View File

@ -29,11 +29,49 @@
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/copy_n.h> #include <CGAL/copy_n.h>
#include <algorithm> #include <algorithm>
#include <iosfwd> #include <iosfwd>
CGAL_BEGIN_NAMESPACE CGAL_BEGIN_NAMESPACE
// Not documented
template <class T> inline
bool
are_sorted(const T & a, const T & b, const T & c)
{
return a <= b && b <= c;
}
// Not documented
template <class T> inline
bool
are_strictly_sorted(const T & a, const T & b, const T & c)
{
return a < b && b < c;
}
// Not documented
// Checks that b is in the interval [min(a, c) , max(a, c)].
template <class T> inline
bool
are_ordered(const T & a, const T & b, const T & c)
{
const T& min = (CGAL::min)(a, c);
const T& max = (CGAL::max)(a, c);
return min <= b && b <= max;
}
// Not documented
// Checks that b is in the interval ]min(a, c) , max(a, c)[.
template <class T> inline
bool
are_strictly_ordered(const T & a, const T & b, const T & c)
{
const T& min = (CGAL::min)(a, c);
const T& max = (CGAL::max)(a, c);
return min < b && b < max;
}
template <class ForwardIterator> template <class ForwardIterator>
inline inline
ForwardIterator ForwardIterator