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

Modified cartesian converter to support optionals and variants

This commit is contained in:
Philipp Möller 2011-08-25 10:11:55 +00:00
parent cc01731a34
commit cf39a595b3
1 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Cartesian_kernel/include/CGAL/Cartesian_converter.h
View File

@ -36,7 +36,14 @@
#include <CGAL/Bbox_2.h>
#include <CGAL/Bbox_3.h>
#include <CGAL/Origin.h>
#include <CGAL/Kernel/Type_mapper.h>
#include <vector>
#include <boost/mpl/lambda.hpp>
#include <boost/mpl/transform.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/mpl/not.hpp>
#include <boost/mpl/logical.hpp>
#include <boost/mpl/remove.hpp>
namespace CGAL {
@ -48,6 +55,37 @@ struct Default_converter {
typedef typename K2::FT FT2;
typedef ::CGAL::NT_converter<FT1, FT2> Type;
};
template<typename Seq, typename K1, typename K2>
struct Transform_type_mapper {
typedef typename boost::mpl::transform< Seq, typename boost::mpl::lambda< Type_mapper< boost::mpl::_1, K1, K2 > >::type >::type type;
};
// Out will be a variant, source kernel and target kernel
template<typename Conv, typename Out>
struct Converting_visitor : boost::static_visitor<> {
Converting_visitor(const Conv& conv, Out& out) : conv(&conv), out(&out) {}
const Conv* conv;
Out* out;
template<typename T>
void operator()(const T& t) {
*out = conv->operator()(t);
}
template<typename T>
void operator()(const std::vector<T>& t) {
typedef typename Type_mapper< T, typename Conv::Source_kernel, typename Conv::Target_kernel >::type value_type;
std::vector< value_type > tmp(t.size());
for(std::size_t i = 0; i < t.size(); ++i) {
tmp[i] = conv->operator()(t[i]);
}
*out = tmp;
}
};
} // namespace internal
template < class K1, class K2,
@ -56,7 +94,7 @@ template < class K1, class K2,
class Cartesian_converter : public Enum_converter
{
typedef Enum_converter Base;
typedef Cartesian_converter Self;
public:
typedef K1 Source_kernel;
typedef K2 Target_kernel;
@ -94,6 +132,58 @@ public:
return c(a);
}
// drop the boost::detail::variant::void_ generated by the macros
// from the sequence, transform with the type mapper and throw the
// new list into a variant
// visit to get the type, and copy construct inside the return type
template<BOOST_VARIANT_ENUM_PARAMS(typename U)>
boost::optional<
typename boost::make_variant_over<
typename internal::Transform_type_mapper<
typename boost::mpl::remove< boost::mpl::vector< BOOST_VARIANT_ENUM_PARAMS(U) >,
boost::detail::variant::void_ >::type
, K1, K2 >::type
>::type >
operator()(const boost::optional< boost::variant< BOOST_VARIANT_ENUM_PARAMS(U) > >& o) const {
typedef boost::optional<
typename boost::make_variant_over<
typename internal::Transform_type_mapper<
typename boost::mpl::remove< boost::mpl::vector< BOOST_VARIANT_ENUM_PARAMS(U) >,
boost::detail::variant::void_ >::type
, K1, K2 >::type
>::type > result_type;
result_type res;
if(!o) {
// empty converts to empty
return res;
}
internal::Converting_visitor<Self, result_type> conv_visitor = internal::Converting_visitor<Self, result_type>(*this, res);
boost::apply_visitor(conv_visitor, *o);
return res;
}
template<BOOST_VARIANT_ENUM_PARAMS(typename U)>
typename boost::make_variant_over<
typename internal::Transform_type_mapper<
typename boost::mpl::remove< boost::mpl::vector< BOOST_VARIANT_ENUM_PARAMS(U) >,
boost::detail::variant::void_ >::type
, K1, K2 >::type
>::type
operator()(const boost::variant< BOOST_VARIANT_ENUM_PARAMS(U) > & o) const {
typedef
typename boost::make_variant_over<
typename internal::Transform_type_mapper<
typename boost::mpl::remove< boost::mpl::vector< BOOST_VARIANT_ENUM_PARAMS(U) >,
boost::detail::variant::void_ >::type
, K1, K2 >::type
>::type result_type;
result_type res;
internal::Converting_visitor<Self, result_type> conv_visitor = internal::Converting_visitor<Self, result_type>(*this, res);
boost::apply_visitor(conv_visitor, o);
return res;
}
typename K2::Object_2
operator()(const typename K1::Object_2 &obj) const
{