mirror of https://github.com/CGAL/cgal
Improved readability of Lazy_alpha_nt_2 (no real changes)
This commit is contained in:
Mael Rouxel-Labbé
parent
f954f8f6cf
commit
5c1f2d8795
|
|
@ -12,10 +12,6 @@
|
|||
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
//
|
||||
//
|
||||
// Author(s) : Sébastien Loriot <sebastien.loriot@geometryfactory.com>
|
||||
|
||||
#ifndef CGAL_INTERNAL_LAZY_ALPHA_NT_2_H
|
||||
|
|
@ -28,91 +24,105 @@
|
|||
#include <CGAL/assertions.h>
|
||||
#include <CGAL/Regular_triangulation_euclidean_traits_2.h>
|
||||
#include <CGAL/Cartesian_converter.h>
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/mpl/has_xxx.hpp>
|
||||
#include <boost/type_traits.hpp>
|
||||
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
namespace CGAL {
|
||||
|
||||
namespace internal{
|
||||
namespace internal {
|
||||
|
||||
//non-weighted case
|
||||
template <class Weighted_tag,class Input_traits,class Kernel_input,class Kernel_approx,class Kernel_exact>
|
||||
//non-weighted case
|
||||
template <class Weighted_tag, class Input_traits, class Kernel_input,
|
||||
class Kernel_approx, class Kernel_exact>
|
||||
struct Types_for_alpha_nt_2
|
||||
{
|
||||
//Converter types
|
||||
typedef CGAL::Cartesian_converter<Kernel_input,Kernel_approx> To_approx;
|
||||
typedef CGAL::Cartesian_converter<Kernel_input,Kernel_exact> To_exact;
|
||||
//Traits types
|
||||
|
||||
//Point types
|
||||
typedef typename Kernel_approx::Point_2 Approx_point;
|
||||
typedef typename Kernel_exact::Point_2 Exact_point;
|
||||
typedef typename Kernel_input::Point_2 Input_point;
|
||||
//Constructions
|
||||
typedef typename Kernel_approx::Compute_squared_radius_2 Approx_squared_radius;
|
||||
typedef typename Kernel_exact::Compute_squared_radius_2 Exact_squared_radius;
|
||||
};
|
||||
|
||||
|
||||
//weighted case
|
||||
template <class Input_traits,class Kernel_input,class Kernel_approx,class Kernel_exact>
|
||||
struct Types_for_alpha_nt_2< ::CGAL::Tag_true,Input_traits,Kernel_input,Kernel_approx,Kernel_exact>
|
||||
{
|
||||
//Converter types
|
||||
typedef CGAL::Cartesian_converter<Kernel_input,Kernel_approx> To_approx;
|
||||
typedef CGAL::Cartesian_converter<Kernel_input,Kernel_exact> To_exact;
|
||||
//Traits types
|
||||
typedef ::CGAL::Regular_triangulation_euclidean_traits_2<Kernel_approx> Approx_traits;
|
||||
typedef ::CGAL::Regular_triangulation_euclidean_traits_2<Kernel_exact> Exact_traits;
|
||||
//Point types
|
||||
typedef typename Approx_traits::Weighted_point Approx_point;
|
||||
typedef typename Exact_traits::Weighted_point Exact_point;
|
||||
typedef typename Input_traits::Weighted_point Input_point;
|
||||
//Constructions
|
||||
typedef typename Approx_traits::Compute_squared_radius_2 Approx_squared_radius;
|
||||
typedef typename Exact_traits::Compute_squared_radius_2 Exact_squared_radius;
|
||||
//Converter types
|
||||
typedef CGAL::Cartesian_converter<Kernel_input, Kernel_approx> To_approx;
|
||||
typedef CGAL::Cartesian_converter<Kernel_input, Kernel_exact> To_exact;
|
||||
|
||||
//Point types
|
||||
typedef typename Kernel_approx::Point_2 Approx_point;
|
||||
typedef typename Kernel_exact::Point_2 Exact_point;
|
||||
typedef typename Kernel_input::Point_2 Input_point;
|
||||
|
||||
//Constructions
|
||||
typedef typename Kernel_approx::Compute_squared_radius_2 Approx_squared_radius;
|
||||
typedef typename Kernel_exact::Compute_squared_radius_2 Exact_squared_radius;
|
||||
};
|
||||
|
||||
//weighted case
|
||||
template <class Input_traits, class Kernel_input,
|
||||
class Kernel_approx, class Kernel_exact>
|
||||
struct Types_for_alpha_nt_2<::CGAL::Tag_true /* Weighted_tag */,
|
||||
Input_traits, Kernel_input,
|
||||
Kernel_approx, Kernel_exact>
|
||||
{
|
||||
//Converter types
|
||||
typedef CGAL::Cartesian_converter<Kernel_input, Kernel_approx> To_approx;
|
||||
typedef CGAL::Cartesian_converter<Kernel_input, Kernel_exact> To_exact;
|
||||
|
||||
//Traits types
|
||||
typedef ::CGAL::Regular_triangulation_euclidean_traits_2<Kernel_approx> Approx_traits;
|
||||
typedef ::CGAL::Regular_triangulation_euclidean_traits_2<Kernel_exact> Exact_traits;
|
||||
|
||||
//Point types
|
||||
typedef typename Approx_traits::Weighted_point Approx_point;
|
||||
typedef typename Exact_traits::Weighted_point Exact_point;
|
||||
typedef typename Input_traits::Weighted_point Input_point;
|
||||
|
||||
//Constructions
|
||||
typedef typename Approx_traits::Compute_squared_radius_2 Approx_squared_radius;
|
||||
typedef typename Exact_traits::Compute_squared_radius_2 Exact_squared_radius;
|
||||
};
|
||||
|
||||
template<class Input_traits, bool mode, class Weighted_tag>
|
||||
class Lazy_alpha_nt_2{
|
||||
//NT & kernels
|
||||
typedef CGAL::Interval_nt<mode> NT_approx;
|
||||
class Lazy_alpha_nt_2
|
||||
{
|
||||
//NT & kernels
|
||||
typedef CGAL::Interval_nt<mode> NT_approx;
|
||||
|
||||
//Gmpq or Quotient<MP_float>
|
||||
typedef Exact_field_selector<double>::Type NT_exact;
|
||||
typedef CGAL::Simple_cartesian<NT_approx> Kernel_approx;
|
||||
typedef CGAL::Simple_cartesian<NT_exact> Kernel_exact;
|
||||
typedef typename Kernel_traits<typename Input_traits::Point_2>::Kernel Kernel_input;
|
||||
//Helper class for weighted and non-weighted case
|
||||
typedef Types_for_alpha_nt_2<Weighted_tag,Input_traits,Kernel_input,Kernel_approx,Kernel_exact> Types;
|
||||
|
||||
//Converters
|
||||
typedef typename Types::To_approx To_approx;
|
||||
typedef typename Types::To_exact To_exact;
|
||||
|
||||
//Constructions class
|
||||
typedef typename Types::Approx_squared_radius Approx_squared_radius;
|
||||
typedef typename Types::Exact_squared_radius Exact_squared_radius;
|
||||
|
||||
//Point
|
||||
typedef typename Types::Approx_point Approx_point;
|
||||
typedef typename Types::Exact_point Exact_point;
|
||||
typedef typename Types::Input_point Input_point;
|
||||
//Convertion functions
|
||||
Approx_point to_approx(const Input_point& wp) const {
|
||||
typedef Exact_field_selector<double>::Type NT_exact;
|
||||
typedef CGAL::Simple_cartesian<NT_approx> Kernel_approx;
|
||||
typedef CGAL::Simple_cartesian<NT_exact> Kernel_exact;
|
||||
typedef typename Kernel_traits<typename Input_traits::Point_2>::Kernel Kernel_input;
|
||||
|
||||
//Helper class for weighted and non-weighted case
|
||||
typedef Types_for_alpha_nt_2<Weighted_tag, Input_traits, Kernel_input,
|
||||
Kernel_approx, Kernel_exact> Types;
|
||||
|
||||
//Converters
|
||||
typedef typename Types::To_approx To_approx;
|
||||
typedef typename Types::To_exact To_exact;
|
||||
|
||||
//Constructions class
|
||||
typedef typename Types::Approx_squared_radius Approx_squared_radius;
|
||||
typedef typename Types::Exact_squared_radius Exact_squared_radius;
|
||||
|
||||
//Point
|
||||
typedef typename Types::Approx_point Approx_point;
|
||||
typedef typename Types::Exact_point Exact_point;
|
||||
typedef typename Types::Input_point Input_point;
|
||||
|
||||
//Convertion functions
|
||||
Approx_point to_approx(const Input_point& wp) const
|
||||
{
|
||||
To_approx converter;
|
||||
return converter(wp);
|
||||
}
|
||||
|
||||
Exact_point to_exact(const Input_point& wp) const {
|
||||
|
||||
Exact_point to_exact(const Input_point& wp) const
|
||||
{
|
||||
To_exact converter;
|
||||
return converter(wp);
|
||||
}
|
||||
|
||||
|
||||
//members
|
||||
//members
|
||||
unsigned nb_pt;
|
||||
//the members can be updated when calling method exact()
|
||||
mutable bool updated;
|
||||
|
|
@ -121,68 +131,70 @@ class Lazy_alpha_nt_2{
|
|||
typedef std::vector<const Input_point*> Data_vector;
|
||||
boost::shared_ptr<Data_vector> inputs_ptr;
|
||||
|
||||
//private functions
|
||||
const Data_vector& data() const{ return *inputs_ptr;}
|
||||
//private functions
|
||||
const Data_vector& data() const { return *inputs_ptr; }
|
||||
|
||||
Data_vector&
|
||||
data(){ return *inputs_ptr; }
|
||||
|
||||
Data_vector&
|
||||
data(){ return *inputs_ptr;}
|
||||
|
||||
|
||||
public:
|
||||
|
||||
typedef NT_exact Exact_nt;
|
||||
typedef NT_approx Approximate_nt;
|
||||
|
||||
void update_exact() const{
|
||||
void update_exact() const
|
||||
{
|
||||
switch (nb_pt){
|
||||
case 1:
|
||||
exact_ = Exact_squared_radius()( to_exact(*data()[0]) );
|
||||
break;
|
||||
break;
|
||||
case 2:
|
||||
exact_ = Exact_squared_radius()( to_exact(*data()[0]),to_exact(*data()[1]) );
|
||||
break;
|
||||
break;
|
||||
case 3:
|
||||
exact_ = Exact_squared_radius()( to_exact(*data()[0]),to_exact(*data()[1]),to_exact(*data()[2]) );
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
CGAL_assertion(false);
|
||||
}
|
||||
updated=true;
|
||||
}
|
||||
|
||||
void set_approx(){
|
||||
|
||||
void set_approx()
|
||||
{
|
||||
switch (nb_pt){
|
||||
case 1:
|
||||
approx_ = Approx_squared_radius()( to_approx(*data()[0]) );
|
||||
break;
|
||||
break;
|
||||
case 2:
|
||||
approx_ = Approx_squared_radius()( to_approx(*data()[0]),to_approx(*data()[1]) );
|
||||
break;
|
||||
break;
|
||||
case 3:
|
||||
approx_ = Approx_squared_radius()( to_approx(*data()[0]),to_approx(*data()[1]),to_approx(*data()[2]) );
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
CGAL_assertion(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const NT_exact& exact() const {
|
||||
const NT_exact& exact() const
|
||||
{
|
||||
if (!updated){
|
||||
update_exact();
|
||||
approx_=to_interval(exact_);
|
||||
approx_ = to_interval(exact_);
|
||||
}
|
||||
return exact_;
|
||||
}
|
||||
|
||||
const NT_approx& approx() const{
|
||||
const NT_approx& approx() const {
|
||||
return approx_;
|
||||
}
|
||||
//Constructors
|
||||
Lazy_alpha_nt_2():nb_pt(0),updated(true),exact_(0),approx_(0){}
|
||||
|
||||
Lazy_alpha_nt_2(double d):nb_pt(0),updated(true),exact_(d),approx_(d){}
|
||||
|
||||
Lazy_alpha_nt_2(const Input_point& wp1):nb_pt(1),updated(false),inputs_ptr(new Data_vector())
|
||||
|
||||
//Constructors
|
||||
Lazy_alpha_nt_2() : nb_pt(0), updated(true), exact_(0), approx_(0) { }
|
||||
Lazy_alpha_nt_2(double d) : nb_pt(0), updated(true), exact_(d), approx_(d) { }
|
||||
|
||||
Lazy_alpha_nt_2(const Input_point& wp1)
|
||||
:nb_pt(1), updated(false), inputs_ptr(new Data_vector())
|
||||
{
|
||||
data().reserve(nb_pt);
|
||||
data().push_back(&wp1);
|
||||
|
|
@ -190,7 +202,8 @@ public:
|
|||
}
|
||||
|
||||
Lazy_alpha_nt_2(const Input_point& wp1,
|
||||
const Input_point& wp2):nb_pt(2),updated(false),inputs_ptr(new Data_vector())
|
||||
const Input_point& wp2)
|
||||
: nb_pt(2), updated(false), inputs_ptr(new Data_vector())
|
||||
{
|
||||
data().reserve(nb_pt);
|
||||
data().push_back(&wp1);
|
||||
|
|
@ -199,8 +212,9 @@ public:
|
|||
}
|
||||
|
||||
Lazy_alpha_nt_2(const Input_point& wp1,
|
||||
const Input_point& wp2,
|
||||
const Input_point& wp3):nb_pt(3),updated(false),inputs_ptr(new Data_vector())
|
||||
const Input_point& wp2,
|
||||
const Input_point& wp3)
|
||||
: nb_pt(3), updated(false), inputs_ptr(new Data_vector())
|
||||
{
|
||||
data().reserve(nb_pt);
|
||||
data().push_back(&wp1);
|
||||
|
|
@ -208,8 +222,8 @@ public:
|
|||
data().push_back(&wp3);
|
||||
set_approx();
|
||||
}
|
||||
|
||||
#define CGAL_LANT_COMPARE_FUNCTIONS(CMP) \
|
||||
|
||||
#define CGAL_LANT_COMPARE_FUNCTIONS(CMP) \
|
||||
bool \
|
||||
operator CMP (const Lazy_alpha_nt_2<Input_traits,mode,Weighted_tag> &other) const \
|
||||
{ \
|
||||
|
|
@ -220,7 +234,7 @@ public:
|
|||
return this->exact() CMP other.exact(); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
\
|
||||
|
||||
CGAL_LANT_COMPARE_FUNCTIONS(<)
|
||||
CGAL_LANT_COMPARE_FUNCTIONS(>)
|
||||
|
|
@ -229,74 +243,78 @@ public:
|
|||
CGAL_LANT_COMPARE_FUNCTIONS(==)
|
||||
CGAL_LANT_COMPARE_FUNCTIONS(!=)
|
||||
|
||||
#undef CGAL_LANT_COMPARE_FUNCTIONS
|
||||
#undef CGAL_LANT_COMPARE_FUNCTIONS
|
||||
};
|
||||
|
||||
template<class Input_traits, class Kernel_input, bool mode, class Weighted_tag>
|
||||
std::ostream&
|
||||
operator<< (std::ostream& os,const Lazy_alpha_nt_2<Input_traits,mode,Weighted_tag>& a){
|
||||
operator<< (std::ostream& os, const Lazy_alpha_nt_2<Input_traits, mode, Weighted_tag>& a){
|
||||
return os << ::CGAL::to_double(a.approx());
|
||||
}
|
||||
|
||||
template <class Type_of_alpha>
|
||||
struct Lazy_compute_squared_radius_2 {
|
||||
struct Lazy_compute_squared_radius_2
|
||||
{
|
||||
typedef typename Type_of_alpha::Input_point Point;
|
||||
Type_of_alpha operator() (const Point& p,
|
||||
const Point& q ,
|
||||
const Point& r,
|
||||
const Point& s)
|
||||
{return Type_of_alpha(p,q,r,s);}
|
||||
|
||||
Type_of_alpha operator() ( const Point& p,
|
||||
const Point& q ,
|
||||
const Point& r)
|
||||
{return Type_of_alpha(p,q,r); }
|
||||
Type_of_alpha operator()(const Point& p,
|
||||
const Point& q,
|
||||
const Point& r,
|
||||
const Point& s)
|
||||
{ return Type_of_alpha(p,q,r,s); }
|
||||
|
||||
Type_of_alpha operator() (const Point& p,
|
||||
const Point& q )
|
||||
{return Type_of_alpha(p,q); }
|
||||
Type_of_alpha operator()(const Point& p,
|
||||
const Point& q,
|
||||
const Point& r)
|
||||
{ return Type_of_alpha(p,q,r); }
|
||||
|
||||
Type_of_alpha operator() (const Point& p)
|
||||
{return Type_of_alpha(p);}
|
||||
Type_of_alpha operator()(const Point& p,
|
||||
const Point& q)
|
||||
{ return Type_of_alpha(p,q); }
|
||||
|
||||
Type_of_alpha operator()(const Point& p)
|
||||
{ return Type_of_alpha(p); }
|
||||
};
|
||||
|
||||
|
||||
template <class GeomTraits,class ExactAlphaComparisonTag>
|
||||
template <class GeomTraits, class ExactAlphaComparisonTag>
|
||||
struct Alpha_nt_selector_impl_2;
|
||||
|
||||
template <class GeomTraits>
|
||||
struct Alpha_nt_selector_impl_2<GeomTraits,Tag_false>
|
||||
struct Alpha_nt_selector_impl_2<GeomTraits, Tag_false>
|
||||
{
|
||||
typedef typename GeomTraits::FT Type_of_alpha;
|
||||
typedef typename GeomTraits::Compute_squared_radius_2 Compute_squared_radius_2;
|
||||
typedef typename GeomTraits::FT Type_of_alpha;
|
||||
typedef typename GeomTraits::Compute_squared_radius_2 Compute_squared_radius_2;
|
||||
};
|
||||
|
||||
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(Has_typedef_Weighted_point,Weighted_point,false)
|
||||
|
||||
template <class GeomTraits>
|
||||
struct Alpha_nt_selector_impl_2<GeomTraits,Tag_true>
|
||||
struct Alpha_nt_selector_impl_2<GeomTraits, Tag_true>
|
||||
{
|
||||
//This is not very satisfactory but we can improve it if some user complains.
|
||||
typedef Boolean_tag<
|
||||
Has_typedef_Weighted_point<GeomTraits>::value &&
|
||||
!boost::is_same<
|
||||
typename Kernel_traits<typename GeomTraits::Point_2>::Kernel::Compute_squared_radius_2,
|
||||
typename GeomTraits::Compute_squared_radius_2 >::value
|
||||
> Weighted_tag;
|
||||
typedef Lazy_alpha_nt_2<GeomTraits,true,Weighted_tag> Type_of_alpha;
|
||||
typedef Lazy_compute_squared_radius_2<Type_of_alpha> Compute_squared_radius_2;
|
||||
typename GeomTraits::Compute_squared_radius_2
|
||||
>::value
|
||||
> Weighted_tag;
|
||||
typedef Lazy_alpha_nt_2<GeomTraits, true, Weighted_tag> Type_of_alpha;
|
||||
typedef Lazy_compute_squared_radius_2<Type_of_alpha> Compute_squared_radius_2;
|
||||
};
|
||||
|
||||
template <class GeomTraits,class ExactAlphaComparisonTag>
|
||||
struct Alpha_nt_selector_2:
|
||||
public Alpha_nt_selector_impl_2<GeomTraits,
|
||||
Boolean_tag< boost::is_floating_point<typename GeomTraits::FT>::value && ExactAlphaComparisonTag::value > >
|
||||
{};
|
||||
template <class GeomTraits, class ExactAlphaComparisonTag>
|
||||
struct Alpha_nt_selector_2
|
||||
: public Alpha_nt_selector_impl_2<
|
||||
GeomTraits,
|
||||
Boolean_tag<boost::is_floating_point<typename GeomTraits::FT>::value &&
|
||||
ExactAlphaComparisonTag::value > >
|
||||
{ };
|
||||
|
||||
|
||||
} //namespace internal
|
||||
} // namespace internal
|
||||
|
||||
} //namespace CGAL
|
||||
} // namespace CGAL
|
||||
|
||||
#endif //CGAL_INTERNAL_LAZY_ALPHA_NT_2_H
|
||||
#endif // CGAL_INTERNAL_LAZY_ALPHA_NT_2_H
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue