From b43ba70a5fc364ff29f32334c4ac812bbeb644d5 Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Thu, 20 Oct 2016 12:35:50 -0400 Subject: [PATCH] Rename storare class (used internally); update copy constructor calls. --- .../include/CGAL/Cell_attribute.h | 8 +-- .../include/CGAL/Combinatorial_map.h | 63 +++++++++++-------- .../include/CGAL/Combinatorial_map_storages.h | 14 +---- Combinatorial_map/include/CGAL/Dart.h | 6 +- .../Combinatorial_map_2_test.h | 4 +- 5 files changed, 48 insertions(+), 47 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Cell_attribute.h b/Combinatorial_map/include/CGAL/Cell_attribute.h index f89516641b5..5c5e80a6caa 100644 --- a/Combinatorial_map/include/CGAL/Cell_attribute.h +++ b/Combinatorial_map/include/CGAL/Cell_attribute.h @@ -75,7 +75,7 @@ namespace CGAL { friend class Generalized_map_storage_1; template - friend class Linear_cell_complex_storage_1; + friend class CMap_linear_cell_complex_storage_1; template friend class GMap_linear_cell_complex_storage_1; @@ -178,7 +178,7 @@ namespace CGAL { friend class Generalized_map_storage_1; template - friend class Linear_cell_complex_storage_1; + friend class CMap_linear_cell_complex_storage_1; template friend class GMap_linear_cell_complex_storage_1; @@ -287,7 +287,7 @@ namespace CGAL { friend class Generalized_map_storage_1; template - friend class Linear_cell_complex_storage_1; + friend class CMap_linear_cell_complex_storage_1; template friend class GMap_linear_cell_complex_storage_1; @@ -325,7 +325,7 @@ namespace CGAL { friend class Generalized_map_storage_1; template - friend class Linear_cell_complex_storage_1; + friend class CMap_linear_cell_complex_storage_1; template friend class GMap_linear_cell_complex_storage_1; diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 2a3aab26689..9fc9f0afd94 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -20,12 +20,15 @@ #ifndef CGAL_COMBINATORIAL_MAP_H #define CGAL_COMBINATORIAL_MAP_H 1 -#include #include #include #include #include + +#include #include +#include +#include #if defined(CGAL_CMAP_DART_DEPRECATED) && !defined(CGAL_NO_DEPRECATED_CODE) #include @@ -35,16 +38,12 @@ #include #include -#include -#include -#include + #include #include #include #include - #include - #include #if defined( __INTEL_COMPILER ) @@ -326,19 +325,19 @@ namespace CGAL { { copy/**/(amap, converters); } // "Copy constructor" from a map having different type. - template + template Combinatorial_map_base(const CMap2& amap, Converters& converters, - const Dartinfoconverter& dartinfoconverter) - { copy/**/(amap, converters, + const DartInfoConverter& dartinfoconverter) + { copy/**/(amap, converters, dartinfoconverter); } // "Copy constructor" from a map having different type. - template + template Combinatorial_map_base(const CMap2& amap, Converters& converters, - const Dartinfoconverter& dartinfoconverter, - const Pointconverter& pointconverter) - { copy/**/(amap, converters, + const DartInfoConverter& dartinfoconverter, + const PointConverter& pointconverter) + { copy/**/(amap, converters, dartinfoconverter, pointconverter); } @@ -1347,8 +1346,8 @@ namespace CGAL { ++nb; for ( Ite it2(*this, it1, amark); it2.cont(); ++it2 ) { - aos << &(**it2) << " - " << std::flush; - mark(*it2, amark); + aos << darts().index(it2) << " - " << std::flush; + mark(it2, amark); } aos << std::endl; } @@ -3530,6 +3529,8 @@ namespace CGAL { it!=darts().end(); ++it) { dual[it] = amap.create_dart(); + internal::Copy_dart_info_functor::run(amap, static_cast(*this), + it, dual[it]); if ( it==adart && res==amap.null_handle ) res = dual[it]; } @@ -4861,23 +4862,31 @@ namespace CGAL { Combinatorial_map() : Base() {} - Combinatorial_map(const Self & amap) : Base() - { Base::template copy(amap); } + Combinatorial_map(const Self & amap) : Base(amap) + {} template < class CMap > - Combinatorial_map(const CMap & amap) : Base() - { Base::template copy(amap); } + Combinatorial_map(const CMap & amap) : Base(amap) + {} template < class CMap, typename Converters > - Combinatorial_map(const CMap & amap, const Converters& converters) : Base() - { Base::template copy - (amap, converters); } + Combinatorial_map(const CMap & amap, const Converters& converters) : + Base(amap, converters) + {} - template < class CMap, typename Converters, typename Pointconverter > + template < class CMap, typename Converters, typename DartInfoConverter > Combinatorial_map(const CMap & amap, const Converters& converters, - const Pointconverter& pointconverter) : Base() - { Base::template copy - (amap, converters, pointconverter); } + const DartInfoConverter& dartinfoconverter) : + Base(amap, converters, dartinfoconverter) + {} + + template < class CMap, typename Converters, typename DartInfoConverter, + typename PointConverter > + Combinatorial_map(const CMap & amap, const Converters& converters, + const DartInfoConverter& dartinfoconverter, + const PointConverter& pointconverter) : + Base(amap, converters, dartinfoconverter, pointconverter) + {} }; } // namespace CGAL diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h index df47f18cf7e..8a0574bbce3 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h @@ -21,7 +21,6 @@ #define CGAL_COMBINATORIAL_MAP_STORAGES_H 1 #include - #include #include #include @@ -43,19 +42,10 @@ namespace CGAL { /** @file Combinatorial_map_storages.h * Definition of storages for dD Combinatorial map. */ - - struct Index_hash_function { - typedef std::size_t result_type; - template - std::size_t operator() (const H& h) const { - return h; - } - }; - // Storage of darts with compact container, beta with handles template class Combinatorial_map_storage_1 - { + { public: typedef Combinatorial_map_storage_1 Self; typedef CGAL::Tag_false Use_index; @@ -312,7 +302,7 @@ namespace CGAL { ah->set_dart(adart); } -#if !defined(CGAL_CMAP_DART_DEPRECATED) +#if !defined(CGAL_CMAP_DART_DEPRECATED) || defined(CGAL_NO_DEPRECATED_CODE) // Get the information associated with a given dart Dart_info& info(Dart_handle adart) { return adart->info(); } diff --git a/Combinatorial_map/include/CGAL/Dart.h b/Combinatorial_map/include/CGAL/Dart.h index 4db9e921073..0371024c06f 100644 --- a/Combinatorial_map/include/CGAL/Dart.h +++ b/Combinatorial_map/include/CGAL/Dart.h @@ -49,7 +49,7 @@ namespace CGAL { friend class Generalized_map_storage_1; template - friend class Linear_cell_complex_storage_1; + friend class CMap_linear_cell_complex_storage_1; template friend class GMap_linear_cell_complex_storage_1; @@ -183,7 +183,7 @@ namespace CGAL { friend class Combinatorial_map_storage_1; template - friend class Linear_cell_complex_storage_1; + friend class CMap_linear_cell_complex_storage_1; template friend class Compact_container; @@ -282,7 +282,7 @@ namespace CGAL { friend class Generalized_map_storage_1; template - friend class Linear_cell_complex_storage_1; + friend class CMap_linear_cell_complex_storage_1; template friend class GMap_linear_cell_complex_storage_1; diff --git a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h index c251a9df4dc..416012057ad 100644 --- a/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h +++ b/Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h @@ -78,8 +78,10 @@ bool test2D() map.make_edge(); dh = map.make_combinatorial_tetrahedron(); - cout << "Nombre de brins : " << map.number_of_darts() << endl; + cout << "Nb of darts: " << map.number_of_darts() << endl; map.display_darts(std::cout, true); + std::cout<<"Faces:"<(std::cout); cout << "Parcours de CC : "; for ( typename Map::template Dart_of_orbit_range<1,2>::iterator it ( map, dh );