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

Added support to Lazy kernel for constructions that return Object, fixed a bug in Line_arc_3 - Line_arc_3 intersections

This commit is contained in:
Philipp Möller 2011-11-07 15:38:49 +00:00
parent 44abf6a332
commit 875bde1083
3 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
View File

@ -117,26 +117,26 @@ namespace CGAL {
}
} else if (comparison == 0) {
*res++ = result_type(std::make_pair(l2.lower_xyz_extremity(),1u));
}
else {
int comparison =
SK().compare_xyz_3_object()(l1.lower_xyz_extremity(),
l2.higher_xyz_extremity());
if(comparison < 0) {
if(SK().compare_xyz_3_object()(l1.higher_xyz_extremity(),
l2.higher_xyz_extremity()) <= 0) {
*res++ = result_type(l1);
} else {
*res++ = result_type
(Line_arc_3(l1.supporting_line(),
l1.lower_xyz_extremity(),
l2.higher_xyz_extremity() ));
}
}
else if (comparison == 0){
*res++ = result_type(std::make_pair(l1.lower_xyz_extremity(),1u));
}
}
else {
int comparison =
SK().compare_xyz_3_object()(l1.lower_xyz_extremity(),
l2.higher_xyz_extremity());
if(comparison < 0) {
if(SK().compare_xyz_3_object()(l1.higher_xyz_extremity(),
l2.higher_xyz_extremity()) <= 0) {
*res++ = result_type(l1);
} else {
*res++ = result_type
(Line_arc_3(l1.supporting_line(),
l1.lower_xyz_extremity(),
l2.higher_xyz_extremity() ));
}
}
else if (comparison == 0){
*res++ = result_type(std::make_pair(l1.lower_xyz_extremity(),1u));
}
}
}
return res;

2
Filtered_kernel/include/CGAL/Lazy.h
View File

@ -1838,7 +1838,7 @@ namespace internal {
Origin* o;
template<typename T>
void operator()(const T& t) {
void operator()(const T&) {
// the equivalent type we are currently matching in the lazy kernel
typedef T AKT;
typedef typename Type_mapper<AKT, AK, EK>::type EKT;

29
Filtered_kernel/include/CGAL/Lazy_kernel.h
View File

@ -46,6 +46,11 @@ namespace internal {
struct Get_rs {
typedef typename T::result_type type;
};
template<typename T>
struct Get_lazy_rs : boost::mpl::eval_if< typename internal::Has_result_type< T >,
typename internal::Get_rs< T >,
typename boost::mpl::identity< T > > {};
}
// Exact_kernel = exact kernel that will be made lazy
@ -159,16 +164,26 @@ public:
CGAL_Kernel_cons(Intersect_with_iterators_2,
intersect_with_iterators_2_object)
#else
// This does the following: If the Construction has a result_type
// member, do the eval_if dance, otherwise we have (hopefully) a
// variant result_type. The inner eval_if dance is necessary to
// prevent the compiler from trying to instantiate the result_type
// if it isn't actually there. The true branch of the outer most if
// evaluates to either Lazy_construction_object,
// Lazy_construction_nt or Lazy_construction; depending on the
// result_type.
#define CGAL_Kernel_cons(C, Cf) \
typedef typename boost::mpl::if_< internal::Has_result_type< typename Approximate_kernel::C >, \
typename boost::mpl::if_< boost::is_same< typename boost::mpl::eval_if< internal::Has_result_type< typename Approximate_kernel::C >, \
typename internal::Get_rs< typename Approximate_kernel::C >, \
boost::mpl::identity< internal::Get_rs < typename Approximate_kernel::C > > >::type, \
typename Approximate_kernel::FT>, \
Lazy_construction_nt<Kernel, typename Approximate_kernel::C, typename Exact_kernel::C>, \
Lazy_construction<Kernel,typename Approximate_kernel::C, typename Exact_kernel::C> >::type, \
typename boost::mpl::if_< boost::is_same< typename internal::Get_lazy_rs< typename Approximate_kernel::C >::type , \
typename Approximate_kernel::FT >, \
Lazy_construction_nt< Kernel, typename Approximate_kernel::C, typename Exact_kernel::C >, \
typename boost::mpl::if_< boost::is_same< typename internal::Get_lazy_rs< typename Approximate_kernel::C >::type, \
typename CGAL::Object >, \
Lazy_construction_object< Kernel,typename Approximate_kernel::C, typename Exact_kernel::C >, \
Lazy_construction< Kernel,typename Approximate_kernel::C, typename Exact_kernel::C > >::type \
>::type, \
Lazy_construction_variant< Kernel, typename Approximate_kernel::C, typename Exact_kernel::C > >::type C; \
C Cf() const { return C(); }
C Cf() const { return C(); }
#endif //CGAL_INTERSECT_WITH_ITERATORS_2