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

Clean-up

This commit is contained in:
Maxime Gimeno 2018-04-26 14:14:31 +02:00
parent fbc7af1345
commit 7298214c57
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Property_map/include/CGAL/property_map.h
View File

@ -511,38 +511,35 @@ make_boolean_property_map(Set& set_)
/// It means that `K1` and `K2` must be Cartesian Kernels. /// It means that `K1` and `K2` must be Cartesian Kernels.
/// \cgalModels `ReadWritePropertyMap` /// \cgalModels `ReadWritePropertyMap`
template<class K1, class K2, class Vpm, class t_category = typename boost::property_traits<Vpm>::category> template<class K1, class K2, class Vpm, class t_category = typename boost::property_traits<Vpm>::category>
struct Kernel_converter_property_map struct Cartesian_converter_property_map
{ {
typedef typename boost::property_traits<Vpm>::key_type key_type; typedef typename boost::property_traits<Vpm>::key_type key_type;
typedef typename K2::Point_3 value_type; typedef typename K2::Point_3 value_type;
typedef typename K2::Point_3 reference; typedef typename K2::Point_3 reference;
typedef t_category category; typedef t_category category;
Vpm* vpm; Vpm vpm;
Kernel_converter_property_map(Vpm* vpm):vpm(vpm){} Cartesian_converter_property_map(Vpm vpm):vpm(vpm){}
Kernel_converter_property_map():vpm(NULL){}
friend value_type get(const Kernel_converter_property_map<K1, K2, Vpm, category>& pm, const key_type& k) friend value_type get(const Cartesian_converter_property_map<K1, K2, Vpm, category>& pm, const key_type& k)
{ {
CGAL_assertion(pm.vpm!=NULL);
value_type res = value_type res =
CGAL::Cartesian_converter<K1, K2>()(get(*pm.vpm, k)); CGAL::Cartesian_converter<K1, K2>()(get(pm.vpm, k));
return res; return res;
} }
friend void put(Kernel_converter_property_map<K1, K2, Vpm, category>& pm, const key_type& k, const value_type& v) friend void put(Cartesian_converter_property_map<K1, K2, Vpm, category>& pm, const key_type& k, const value_type& v)
{ {
CGAL_assertion(pm.vpm!=NULL); put(pm.vpm, k, CGAL::Cartesian_converter<K2, K1>()(v));
put(*pm.vpm, k, CGAL::Cartesian_converter<K2, K1>()(v));
} }
}; };
/// \ingroup PkgProperty_map /// \ingroup PkgProperty_map
/// returns `Kernel_converter_property_map<K1,K2, Vpm, category>(&vpm)` /// returns `Cartesian_converter_property_map<K1,K2, Vpm, category>(&vpm)`
template<class K1, class K2, class Vpm, class category = typename boost::property_traits<Vpm>::category> template<class K1, class K2, class Vpm, class category = typename boost::property_traits<Vpm>::category>
Kernel_converter_property_map<K1, K2, Vpm, category> Cartesian_converter_property_map<K1, K2, Vpm, category>
make_kernel_converter_property_map(Vpm& vpm) make_cartesian_converter_property_map(Vpm vpm)
{ {
return Kernel_converter_property_map<K1, K2, Vpm, category>(&vpm); return Kernel_converter_property_map<K1, K2, Vpm, category>(vpm);
} }
} // namespace CGAL } // namespace CGAL

2
Property_map/test/Property_map/kernel_converter_properties_test.cpp
View File

@ -19,7 +19,7 @@ test()
typedef typename boost::property_map<Mesh, CGAL::vertex_point_t >::type VPMap; typedef typename boost::property_map<Mesh, CGAL::vertex_point_t >::type VPMap;
VPMap vmap = get(CGAL::vertex_point, m); VPMap vmap = get(CGAL::vertex_point, m);
CGAL::Kernel_converter_property_map<K1,K2, VPMap> kcmap =CGAL::make_kernel_converter_property_map<K1,K2>(vmap); CGAL::Cartesian_converter_property_map<K1,K2, VPMap> kcmap =CGAL::make_cartesian_converter_property_map<K1,K2>(vmap);
CGAL_assertion(get(kcmap, *vertices(m).begin()) == CGAL::Point_3<K2>(2,0,0)); CGAL_assertion(get(kcmap, *vertices(m).begin()) == CGAL::Point_3<K2>(2,0,0));
put(kcmap, *vertices(m).begin(), CGAL::Point_3<K2>(0,2,3)); put(kcmap, *vertices(m).begin(), CGAL::Point_3<K2>(0,2,3));
CGAL_assertion(get(kcmap, *vertices(m).begin()) == CGAL::Point_3<K2>(0,2,3)); CGAL_assertion(get(kcmap, *vertices(m).begin()) == CGAL::Point_3<K2>(0,2,3));