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

fixed min/max problem

This commit is contained in:
Andreas Fabri 2006-08-16 14:43:19 +00:00
parent b927eb413d
commit 12dbb148a9
4 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h
View File

@ -70,8 +70,8 @@ public:
bool operator==(const Iso_cuboidH3<R>& s) const; bool operator==(const Iso_cuboidH3<R>& s) const;
bool operator!=(const Iso_cuboidH3<R>& s) const; bool operator!=(const Iso_cuboidH3<R>& s) const;
const Point_3 & min() const; const Point_3 & min BOOST_PREVENT_MACRO_SUBSTITUTION () const;
const Point_3 & max() const; const Point_3 & max BOOST_PREVENT_MACRO_SUBSTITUTION () const;
Point_3 vertex(int i) const; Point_3 vertex(int i) const;
Point_3 operator[](int i) const; Point_3 operator[](int i) const;
@ -197,7 +197,7 @@ CGAL_KERNEL_INLINE
bool bool
Iso_cuboidH3<R>:: Iso_cuboidH3<R>::
operator==(const Iso_cuboidH3<R>& r) const operator==(const Iso_cuboidH3<R>& r) const
{ return (min() == r.min()) && (max() == r.max()); } { return ((this->min)() == (r.min)()) && ((this->max)() == (r.max)()); }
template < class R > template < class R >
inline inline
@ -209,50 +209,50 @@ operator!=(const Iso_cuboidH3<R>& r) const
template < class R > template < class R >
inline inline
const typename Iso_cuboidH3<R>::Point_3 & const typename Iso_cuboidH3<R>::Point_3 &
Iso_cuboidH3<R>::min() const Iso_cuboidH3<R>::min BOOST_PREVENT_MACRO_SUBSTITUTION () const
{ return get(base).e0; } { return get(base).e0; }
template < class R > template < class R >
inline inline
const typename Iso_cuboidH3<R>::Point_3 & const typename Iso_cuboidH3<R>::Point_3 &
Iso_cuboidH3<R>::max() const Iso_cuboidH3<R>::max BOOST_PREVENT_MACRO_SUBSTITUTION () const
{ return get(base).e1; } { return get(base).e1; }
template < class R > template < class R >
inline inline
typename Iso_cuboidH3<R>::FT typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::xmin() const Iso_cuboidH3<R>::xmin() const
{ return FT( min().hx() ) / FT( min().hw() ); } { return FT( (this->min)().hx() ) / FT( (this->min)().hw() ); }
template < class R > template < class R >
inline inline
typename Iso_cuboidH3<R>::FT typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::ymin() const Iso_cuboidH3<R>::ymin() const
{ return FT( min().hy() ) / FT( min().hw() ); } { return FT( (this->min)().hy() ) / FT( (this->min)().hw() ); }
template < class R > template < class R >
inline inline
typename Iso_cuboidH3<R>::FT typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::zmin() const Iso_cuboidH3<R>::zmin() const
{ return FT( min().hz() ) / FT( min().hw() ); } { return FT( (this->min)().hz() ) / FT( (this->min)().hw() ); }
template < class R > template < class R >
inline inline
typename Iso_cuboidH3<R>::FT typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::xmax() const Iso_cuboidH3<R>::xmax() const
{ return FT( max().hx() ) / FT( max().hw() ); } { return FT( (this->max)().hx() ) / FT( (this->max)().hw() ); }
template < class R > template < class R >
inline inline
typename Iso_cuboidH3<R>::FT typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::ymax() const Iso_cuboidH3<R>::ymax() const
{ return FT( max().hy() ) / FT( max().hw() ); } { return FT( (this->max)().hy() ) / FT( (this->max)().hw() ); }
template < class R > template < class R >
inline inline
typename Iso_cuboidH3<R>::FT typename Iso_cuboidH3<R>::FT
Iso_cuboidH3<R>::zmax() const Iso_cuboidH3<R>::zmax() const
{ return FT( max().hz() ) / FT( max().hw() ); } { return FT( (this->max)().hz() ) / FT( (this->max)().hw() ); }
template < class R > template < class R >
inline inline
@ -293,20 +293,20 @@ Iso_cuboidH3<R>::vertex(int i) const
{ {
switch (i%8) switch (i%8)
{ {
case 0: return min(); case 0: return (this->min)();
case 1: return Point_3( max().hx(), min().hy(), case 1: return Point_3( (this->max)().hx(), (this->min)().hy(),
min().hz(), min().hw() ); (this->min)().hz(), (this->min)().hw() );
case 2: return Point_3( max().hx(), max().hy(), case 2: return Point_3( (this->max)().hx(), (this->max)().hy(),
min().hz(), min().hw() ); (this->min)().hz(), (this->min)().hw() );
case 3: return Point_3( min().hx(), max().hy(), case 3: return Point_3( (this->min)().hx(), (this->max)().hy(),
min().hz(), min().hw() ); (this->min)().hz(), (this->min)().hw() );
case 4: return Point_3( min().hx(), max().hy(), case 4: return Point_3( (this->min)().hx(), (this->max)().hy(),
max().hz(), min().hw() ); (this->max)().hz(), (this->min)().hw() );
case 5: return Point_3( min().hx(), min().hy(), case 5: return Point_3( (this->min)().hx(), (this->min)().hy(),
max().hz(), min().hw() ); (this->max)().hz(), (this->min)().hw() );
case 6: return Point_3( max().hx(), min().hy(), case 6: return Point_3( (this->max)().hx(), (this->min)().hy(),
max().hz(), min().hw() ); (this->max)().hz(), (this->min)().hw() );
default: /*case 7:*/ return max(); default: /*case 7:*/ return (this->max)();
} }
} }
@ -322,19 +322,19 @@ Bounded_side
Iso_cuboidH3<R>:: Iso_cuboidH3<R>::
bounded_side(const typename Iso_cuboidH3<R>::Point_3& p) const bounded_side(const typename Iso_cuboidH3<R>::Point_3& p) const
{ {
if ( (p.hx()*min().hw() < min().hx()*p.hw() ) if ( (p.hx()*(this->min)().hw() < (this->min)().hx()*p.hw() )
||(p.hy()*min().hw() < min().hy()*p.hw() ) ||(p.hy()*(this->min)().hw() < (this->min)().hy()*p.hw() )
||(p.hz()*min().hw() < min().hz()*p.hw() ) ||(p.hz()*(this->min)().hw() < (this->min)().hz()*p.hw() )
||(p.hx()*max().hw() > max().hx()*p.hw() ) ||(p.hx()*(this->max)().hw() > (this->max)().hx()*p.hw() )
||(p.hy()*max().hw() > max().hy()*p.hw() ) ||(p.hy()*(this->max)().hw() > (this->max)().hy()*p.hw() )
||(p.hz()*max().hw() > max().hz()*p.hw() ) ) ||(p.hz()*(this->max)().hw() > (this->max)().hz()*p.hw() ) )
{ return ON_UNBOUNDED_SIDE; } { return ON_UNBOUNDED_SIDE; }
if ( (p.hx()*min().hw() == min().hx()*p.hw() ) if ( (p.hx()*(this->min)().hw() == (this->min)().hx()*p.hw() )
||(p.hy()*min().hw() == min().hy()*p.hw() ) ||(p.hy()*(this->min)().hw() == (this->min)().hy()*p.hw() )
||(p.hz()*min().hw() == min().hz()*p.hw() ) ||(p.hz()*(this->min)().hw() == (this->min)().hz()*p.hw() )
||(p.hx()*max().hw() == max().hx()*p.hw() ) ||(p.hx()*(this->max)().hw() == (this->max)().hx()*p.hw() )
||(p.hy()*max().hw() == max().hy()*p.hw() ) ||(p.hy()*(this->max)().hw() == (this->max)().hy()*p.hw() )
||(p.hz()*max().hw() == max().hz()*p.hw() ) ) ||(p.hz()*(this->max)().hw() == (this->max)().hz()*p.hw() ) )
{ return ON_BOUNDARY; } { return ON_BOUNDARY; }
else else
{ return ON_BOUNDED_SIDE; } { return ON_BOUNDED_SIDE; }
@ -366,8 +366,8 @@ bool
Iso_cuboidH3<R>:: Iso_cuboidH3<R>::
has_on_unbounded_side(const typename Iso_cuboidH3<R>::Point_3& p) const has_on_unbounded_side(const typename Iso_cuboidH3<R>::Point_3& p) const
{ {
return ( ( lexicographically_xyz_smaller(p,min() )) return ( ( lexicographically_xyz_smaller(p,(this->min)() ))
||( lexicographically_xyz_smaller(max(),p )) ); ||( lexicographically_xyz_smaller((this->max)(),p )) );
} }
template < class R > template < class R >
@ -375,16 +375,16 @@ CGAL_KERNEL_INLINE
bool bool
Iso_cuboidH3<R>::is_degenerate() const Iso_cuboidH3<R>::is_degenerate() const
{ {
return ( ( min().hx() == max().hx() ) return ( ( (this->min)().hx() == (this->max)().hx() )
|| ( min().hy() == max().hy() ) || ( (this->min)().hy() == (this->max)().hy() )
|| ( min().hz() == max().hz() ) ); || ( (this->min)().hz() == (this->max)().hz() ) );
} }
template < class R > template < class R >
inline inline
Bbox_3 Bbox_3
Iso_cuboidH3<R>::bbox() const Iso_cuboidH3<R>::bbox() const
{ return min().bbox() + max().bbox(); } { return (this->min)().bbox() + (this->max)().bbox(); }
template < class R > template < class R >
CGAL_KERNEL_INLINE CGAL_KERNEL_INLINE
@ -392,8 +392,8 @@ Iso_cuboidH3<R>
Iso_cuboidH3<R>:: Iso_cuboidH3<R>::
transform(const typename Iso_cuboidH3<R>::Aff_transformation_3&t) const transform(const typename Iso_cuboidH3<R>::Aff_transformation_3&t) const
{ {
return Iso_cuboidH3<R>(t.transform(min() ), return Iso_cuboidH3<R>(t.transform((this->min)() ),
t.transform(max() ) ); t.transform((this->max)() ) );
} }
CGAL_END_NAMESPACE CGAL_END_NAMESPACE

12
Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h
View File

@ -56,8 +56,8 @@ public:
// CGAL_kernel_assertion(p.y()<=q.y()); // CGAL_kernel_assertion(p.y()<=q.y());
} }
const Point_2 & min() const; const Point_2 & min BOOST_PREVENT_MACRO_SUBSTITUTION () const;
const Point_2 & max() const; const Point_2 & max BOOST_PREVENT_MACRO_SUBSTITUTION () const;
Bounded_side bounded_side(const Point_2& p) const; Bounded_side bounded_side(const Point_2& p) const;
}; };
@ -67,13 +67,13 @@ public:
template < class R > template < class R >
inline inline
const typename Iso_rectangleH2<R>::Point_2 & const typename Iso_rectangleH2<R>::Point_2 &
Iso_rectangleH2<R>::min() const Iso_rectangleH2<R>::min BOOST_PREVENT_MACRO_SUBSTITUTION () const
{ return get(base).e0; } { return get(base).e0; }
template < class R > template < class R >
inline inline
const typename Iso_rectangleH2<R>::Point_2 & const typename Iso_rectangleH2<R>::Point_2 &
Iso_rectangleH2<R>::max() const Iso_rectangleH2<R>::max BOOST_PREVENT_MACRO_SUBSTITUTION () const
{ return get(base).e1; } { return get(base).e1; }
template < class R > template < class R >
@ -82,8 +82,8 @@ Bounded_side
Iso_rectangleH2<R>:: Iso_rectangleH2<R>::
bounded_side(const typename Iso_rectangleH2<R>::Point_2& p) const bounded_side(const typename Iso_rectangleH2<R>::Point_2& p) const
{ {
Oriented_side wrt_min = _where_wrt_L_wedge(min(),p); Oriented_side wrt_min = _where_wrt_L_wedge((this->min)(),p);
Oriented_side wrt_max = _where_wrt_L_wedge(p,max()); Oriented_side wrt_max = _where_wrt_L_wedge(p,(this->max)());
if (( wrt_min == ON_NEGATIVE_SIDE )||( wrt_max == ON_NEGATIVE_SIDE)) if (( wrt_min == ON_NEGATIVE_SIDE )||( wrt_max == ON_NEGATIVE_SIDE))
{ {
return ON_UNBOUNDED_SIDE; return ON_UNBOUNDED_SIDE;

24
Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h
View File

@ -1095,10 +1095,10 @@ namespace HomogeneousKernelFunctors {
FT s2tx = s2.target().x(); FT s2tx = s2.target().x();
FT s2ty = s2.target().y(); FT s2ty = s2.target().y();
CGAL_kernel_precondition(px >= CGAL_NTS min(s1sx, s1tx) && CGAL_kernel_precondition(px >= (CGAL::min)(s1sx, s1tx) &&
px <= CGAL_NTS max(s1sx, s1tx)); px <= (CGAL::max)(s1sx, s1tx));
CGAL_kernel_precondition(px >= CGAL_NTS min(s2sx, s2tx) && CGAL_kernel_precondition(px >= (CGAL::min)(s2sx, s2tx) &&
px <= CGAL_NTS max(s2sx, s2tx)); px <= (CGAL::max)(s2sx, s2tx));
if (s1sx != s1tx && s2sx != s2tx) { if (s1sx != s1tx && s2sx != s2tx) {
FT s1stx = s1sx-s1tx; FT s1stx = s1sx-s1tx;
@ -1897,7 +1897,7 @@ namespace HomogeneousKernelFunctors {
operator()( const Iso_rectangle_2& r) const operator()( const Iso_rectangle_2& r) const
{ {
typename K::Construct_bbox_2 construct_bbox_2; typename K::Construct_bbox_2 construct_bbox_2;
return construct_bbox_2(r.min()) + construct_bbox_2(r.max()); return construct_bbox_2((r.min)()) + construct_bbox_2((r.max)());
} }
Bbox_2 Bbox_2
@ -3262,15 +3262,15 @@ namespace HomogeneousKernelFunctors {
operator()( const Iso_rectangle_2& r, int i) const operator()( const Iso_rectangle_2& r, int i) const
{ {
switch (i%4) { switch (i%4) {
case 0: return r.min(); case 0: return (r.min)();
case 1: case 1:
return Point_2( r.max().hx()*r.min().hw(), return Point_2( (r.max)().hx()*(r.min)().hw(),
r.min().hy()*r.max().hw(), (r.min)().hy()*(r.max)().hw(),
r.min().hw()*r.max().hw() ); (r.min)().hw()*(r.max)().hw() );
case 2: return r.max(); case 2: return r.max();
default: return Point_2( r.min().hx()*r.max().hw(), default: return Point_2( (r.min)().hx()*(r.max)().hw(),
r.max().hy()*r.min().hw(), (r.max)().hy()*(r.min)().hw(),
r.min().hw()*r.max().hw() ); (r.min)().hw()*(r.max)().hw() );
} }
} }
}; };

8
Homogeneous_kernel/include/CGAL/Homogeneous_converter.h
View File

@ -156,8 +156,8 @@ public:
typename K2::Iso_rectangle_2 typename K2::Iso_rectangle_2
operator()(const typename K1::Iso_rectangle_2 &a) const operator()(const typename K1::Iso_rectangle_2 &a) const
{ {
return k.construct_iso_rectangle_2_object()(operator()(a.min()), return k.construct_iso_rectangle_2_object()(operator()((a.min)()),
operator()(a.max()), 0); operator()((a.max)()), 0);
} }
@ -238,8 +238,8 @@ public:
typename K2::Iso_cuboid_3 typename K2::Iso_cuboid_3
operator()(const typename K1::Iso_cuboid_3 &a) const operator()(const typename K1::Iso_cuboid_3 &a) const
{ {
return k.construct_iso_cuboid_3_object()(operator()(a.min()), return k.construct_iso_cuboid_3_object()(operator()((a.min)()),
operator()(a.max()), 0); operator()((a.max)()), 0);
} }
private: private: