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

Change parameter orders for copy methods in CMap, GMap

This commit is contained in:
Guillaume Damiand 2020-03-27 19:06:13 +01:00
parent 0308d1a1bb
commit 5c0d9aaa22
2 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -220,11 +220,11 @@ namespace CGAL {
typename Converters, typename DartInfoConverter, typename Converters, typename DartInfoConverter,
typename PointConverter> typename PointConverter>
void generic_copy(CMap2& amap, void generic_copy(CMap2& amap,
boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy,
boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter, const PointConverter& pointconverter)
boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin=nullptr)
{ {
this->clear(); this->clear();
@ -304,94 +304,94 @@ namespace CGAL {
template<typename CMap2, typename Converters, typename DartInfoConverter, template<typename CMap2, typename Converters, typename DartInfoConverter,
typename PointConverter> typename PointConverter>
void copy(CMap2& amap, void copy(CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter, const PointConverter& pointconverter)
boost::unordered_map
<typename CMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr)
{ {
generic_copy<CMap2, typename CMap2::Dart_handle, Converters, generic_copy<CMap2, typename CMap2::Dart_handle, Converters,
DartInfoConverter, PointConverter> DartInfoConverter, PointConverter>
(amap, converters, dartinfoconverter, pointconverter, (amap, origin_to_copy, copy_to_origin,
origin_to_copy, copy_to_origin); converters, dartinfoconverter, pointconverter);
} }
// (1b) copy(const amap, converters, dartinfoconverter, pointconverter) // (1b) copy(const amap, converters, dartinfoconverter, pointconverter)
template<typename CMap2, typename Converters, typename DartInfoConverter, template<typename CMap2, typename Converters, typename DartInfoConverter,
typename PointConverter> typename PointConverter>
void copy(const CMap2& amap, void copy(const CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter, const PointConverter& pointconverter)
boost::unordered_map {
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr)
{
generic_copy<CMap2, typename CMap2::Dart_const_handle, Converters, generic_copy<CMap2, typename CMap2::Dart_const_handle, Converters,
DartInfoConverter, PointConverter> DartInfoConverter, PointConverter>
(const_cast<CMap2&>(amap), converters, dartinfoconverter, (const_cast<CMap2&>(amap), origin_to_copy, copy_to_origin,
pointconverter, origin_to_copy, copy_to_origin); converters, dartinfoconverter, pointconverter);
} }
// (2a) copy(amap, converters, dartinfoconverter) // (2a) copy(amap, converters, dartinfoconverter)
template<typename CMap2, typename Converters, typename DartInfoConverter> template<typename CMap2, typename Converters, typename DartInfoConverter>
void copy(CMap2& amap, void copy(CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter)
boost::unordered_map
<typename CMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr)
{ {
Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs> Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs>
pointconverter; pointconverter;
copy(amap, converters, dartinfoconverter, pointconverter, copy(amap, origin_to_copy, copy_to_origin,
origin_to_copy, copy_to_origin); converters, dartinfoconverter, pointconverter);
} }
// (2b) copy(const amap, converters, dartinfoconverter) // (2b) copy(const amap, converters, dartinfoconverter)
template <typename CMap2, typename Converters, typename DartInfoConverter> template <typename CMap2, typename Converters, typename DartInfoConverter>
void copy(const CMap2& amap, void copy(const CMap2& amap,
boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter)
boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr)
{ {
Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs> Default_converter_cmap_0attributes_with_point<typename CMap2::Refs, Refs>
pointconverter; pointconverter;
copy(amap, converters, dartinfoconverter, pointconverter, copy(amap, origin_to_copy, copy_to_origin,
origin_to_copy, copy_to_origin); converters, dartinfoconverter, pointconverter);
} }
// (3a) copy(amap, converters) // (3a) copy(amap, converters)
template<typename CMap2, typename Converters> template<typename CMap2, typename Converters>
void copy(CMap2& amap, void copy(CMap2& amap,
const Converters& converters,
boost::unordered_map boost::unordered_map
<typename CMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr, <typename CMap2::Dart_handle, Dart_handle>* origin_to_copy,
boost::unordered_map boost::unordered_map
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr) <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin,
const Converters& converters)
{ {
Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter; Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter;
copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
} }
// (3b) copy(const amap, converters) // (3b) copy(const amap, converters)
template <typename CMap2, typename Converters> template <typename CMap2, typename Converters>
void copy(const CMap2& amap, void copy(const CMap2& amap,
const Converters& converters,
boost::unordered_map boost::unordered_map
<typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr, <typename CMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map boost::unordered_map
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr) <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters)
{ {
Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter; Default_converter_dart_info<typename CMap2::Refs, Refs> dartinfoconverter;
copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
} }
// (4a) copy(amap) // (4a) copy(amap)
@ -403,7 +403,7 @@ namespace CGAL {
<Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr) <Dart_handle, typename CMap2::Dart_handle>* copy_to_origin=nullptr)
{ {
CGAL::cpp11::tuple<> converters; CGAL::cpp11::tuple<> converters;
copy(amap, converters, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters);
} }
// (4b) copy(const amap) // (4b) copy(const amap)
@ -415,8 +415,8 @@ namespace CGAL {
<Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr) <Dart_handle, typename CMap2::Dart_const_handle>* copy_to_origin=nullptr)
{ {
CGAL::cpp11::tuple<> converters; CGAL::cpp11::tuple<> converters;
copy(amap, converters, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters);
} }
// Copy constructor from a map having exactly the same type. // Copy constructor from a map having exactly the same type.
Combinatorial_map_base (const Self & amap) Combinatorial_map_base (const Self & amap)
@ -435,7 +435,7 @@ namespace CGAL {
Combinatorial_map_base(const Combinatorial_map_base<d2, Refs2, Items2, Combinatorial_map_base(const Combinatorial_map_base<d2, Refs2, Items2,
Alloc2, Storage2>& amap, Alloc2, Storage2>& amap,
const Converters& converters) const Converters& converters)
{ copy(amap, converters); } { copy(amap, nullptr, nullptr, converters); }
// "Copy constructor" from a map having different type. // "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2, template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@ -444,7 +444,7 @@ namespace CGAL {
Alloc2, Storage2>& amap, Alloc2, Storage2>& amap,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter) const DartInfoConverter& dartinfoconverter)
{ copy(amap, converters, dartinfoconverter); } { copy(amap, nullptr, nullptr, converters, dartinfoconverter); }
// "Copy constructor" from a map having different type. // "Copy constructor" from a map having different type.
template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2, template <unsigned int d2, typename Refs2, typename Items2, typename Alloc2,
@ -456,7 +456,7 @@ namespace CGAL {
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter) const PointConverter& pointconverter)
{ copy(amap, converters, dartinfoconverter, pointconverter); } { copy(amap, nullptr, nullptr, converters, dartinfoconverter, pointconverter); }
/** Affectation operation. Copies one map to the other. /** Affectation operation. Copies one map to the other.
* @param amap a combinatorial map. * @param amap a combinatorial map.

82
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -186,11 +186,11 @@ namespace CGAL {
typename Converters, typename DartInfoConverter, typename Converters, typename DartInfoConverter,
typename PointConverter> typename PointConverter>
void generic_copy(GMap2& amap, void generic_copy(GMap2& amap,
boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy,
boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter, const PointConverter& pointconverter)
boost::unordered_map<Dart_handle_2, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map<Dart_handle, Dart_handle_2>* copy_to_origin=nullptr)
{ {
this->clear(); this->clear();
@ -268,94 +268,94 @@ namespace CGAL {
template<typename GMap2, typename Converters, typename DartInfoConverter, template<typename GMap2, typename Converters, typename DartInfoConverter,
typename PointConverter> typename PointConverter>
void copy(GMap2& amap, void copy(GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter, const PointConverter& pointconverter)
boost::unordered_map
<typename GMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr)
{ {
generic_copy<GMap2, typename GMap2::Dart_handle, Converters, generic_copy<GMap2, typename GMap2::Dart_handle, Converters,
DartInfoConverter, PointConverter> DartInfoConverter, PointConverter>
(amap, converters, dartinfoconverter, pointconverter, (amap, origin_to_copy, copy_to_origin,
origin_to_copy, copy_to_origin); converters, dartinfoconverter, pointconverter);
} }
// (1b) copy(const amap, converters, dartinfoconverter, pointconverter) // (1b) copy(const amap, converters, dartinfoconverter, pointconverter)
template<typename GMap2, typename Converters, typename DartInfoConverter, template<typename GMap2, typename Converters, typename DartInfoConverter,
typename PointConverter> typename PointConverter>
void copy(const GMap2& amap, void copy(const GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter,
const PointConverter& pointconverter, const PointConverter& pointconverter)
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr)
{ {
generic_copy<GMap2, typename GMap2::Dart_const_handle, generic_copy<GMap2, typename GMap2::Dart_const_handle,
Converters, DartInfoConverter, PointConverter> Converters, DartInfoConverter, PointConverter>
(const_cast<GMap2&>(amap), converters, dartinfoconverter, (const_cast<GMap2&>(amap), origin_to_copy, copy_to_origin,
pointconverter, origin_to_copy, copy_to_origin); converters, dartinfoconverter, pointconverter);
} }
// (2a) copy(amap, converters, dartinfoconverter) // (2a) copy(amap, converters, dartinfoconverter)
template<typename GMap2, typename Converters, typename DartInfoConverter> template<typename GMap2, typename Converters, typename DartInfoConverter>
void copy(GMap2& amap, void copy(GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter)
boost::unordered_map
<typename GMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr)
{ {
Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs> Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs>
pointconverter; pointconverter;
copy(amap, converters, dartinfoconverter, pointconverter, copy(amap, origin_to_copy, copy_to_origin, converters,
origin_to_copy, copy_to_origin); dartinfoconverter, pointconverter);
} }
// (2b) copy(const amap, converters, dartinfoconverter) // (2b) copy(const amap, converters, dartinfoconverter)
template <typename GMap2, typename Converters, typename DartInfoConverter> template <typename GMap2, typename Converters, typename DartInfoConverter>
void copy(const GMap2& amap, void copy(const GMap2& amap,
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters, const Converters& converters,
const DartInfoConverter& dartinfoconverter, const DartInfoConverter& dartinfoconverter)
boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr,
boost::unordered_map
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr)
{ {
Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs> Default_converter_cmap_0attributes_with_point<typename GMap2::Refs, Refs>
pointconverter; pointconverter;
copy(amap, converters, dartinfoconverter, pointconverter, copy(amap, origin_to_copy, copy_to_origin, converters,
origin_to_copy, copy_to_origin); dartinfoconverter, pointconverter);
} }
// (3a) copy(amap, converters) // (3a) copy(amap, converters)
template<typename GMap2, typename Converters> template<typename GMap2, typename Converters>
void copy(GMap2& amap, void copy(GMap2& amap,
const Converters& converters,
boost::unordered_map boost::unordered_map
<typename GMap2::Dart_handle, Dart_handle>* origin_to_copy=nullptr, <typename GMap2::Dart_handle, Dart_handle>* origin_to_copy,
boost::unordered_map boost::unordered_map
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr) <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin,
const Converters& converters)
{ {
Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter; Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter;
copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
} }
// (3b) copy(const amap, converters) // (3b) copy(const amap, converters)
template <typename GMap2, typename Converters> template <typename GMap2, typename Converters>
void copy(const GMap2& amap, void copy(const GMap2& amap,
const Converters& converters,
boost::unordered_map boost::unordered_map
<typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy=nullptr, <typename GMap2::Dart_const_handle, Dart_handle>* origin_to_copy,
boost::unordered_map boost::unordered_map
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr) <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin,
const Converters& converters)
{ {
Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter; Default_converter_dart_info<typename GMap2::Refs, Refs> dartinfoconverter;
copy(amap, converters, dartinfoconverter, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters, dartinfoconverter);
} }
// (4a) copy(amap) // (4a) copy(amap)
@ -367,7 +367,7 @@ namespace CGAL {
<Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr) <Dart_handle, typename GMap2::Dart_handle>* copy_to_origin=nullptr)
{ {
CGAL::cpp11::tuple<> converters; CGAL::cpp11::tuple<> converters;
copy(amap, converters, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters);
} }
// (4b) copy(const amap) // (4b) copy(const amap)
@ -379,7 +379,7 @@ namespace CGAL {
<Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr) <Dart_handle, typename GMap2::Dart_const_handle>* copy_to_origin=nullptr)
{ {
CGAL::cpp11::tuple<> converters; CGAL::cpp11::tuple<> converters;
copy(amap, converters, origin_to_copy, copy_to_origin); copy(amap, origin_to_copy, copy_to_origin, converters);
} }
// Copy constructor from a map having exactly the same type. // Copy constructor from a map having exactly the same type.