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

Start to rename Dart -> Combinatorial_map_dart and GMap_dart -> Generalized_map_dart

This commit is contained in:
Guillaume Damiand 2016-10-04 14:37:52 -04:00
parent 69115dd960
commit 65569a9ff0
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Combinatorial_map/include/CGAL/Combinatorial_map_dart.h
View File

@ -17,8 +17,8 @@
// //
// Author(s) : Guillaume Damiand <guillaume.damiand@liris.cnrs.fr> // Author(s) : Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
// //
#ifndef CGAL_DART_H #ifndef CGAL_COMBINATORIAL_MAP_DART_H
#define CGAL_DART_H 1 #define CGAL_COMBINATORIAL_MAP_DART_H 1
#include <CGAL/Compact_container.h> #include <CGAL/Compact_container.h>
#include <CGAL/assertions.h> #include <CGAL/assertions.h>
@ -27,7 +27,7 @@
namespace CGAL { namespace CGAL {
/** @file Dart.h /** @file Combinatorial_map_dart.h
* Definition of nD dart. * Definition of nD dart.
*/ */
@ -42,14 +42,14 @@ namespace CGAL {
#define CGAL_BETAINV(i) (i>1?i:(i==1?0:1)) #define CGAL_BETAINV(i) (i>1?i:(i==1?0:1))
/** Definition of nD dart. /** Definition of nD dart.
* The Dart class describes an nD dart (basic element of a * The Combinatorial_map_dart class describes an nD dart (basic element of a
* combinatorial map). A dart is composed with handle towards its neighbors, * combinatorial map). A dart is composed with handle towards its neighbors,
* a bitset containing Boolean marks, and handle towards enabled attributes. * a bitset containing Boolean marks, and handle towards enabled attributes.
* n is the dimension of the space (2 for 2D, 3 for 3D...) * n is the dimension of the space (2 for 2D, 3 for 3D...)
* Refs the ref class * Refs the ref class
*/ */
template <unsigned int d, typename Refs> template <unsigned int d, typename Refs>
struct Dart struct Combinatorial_map_dart
{ {
template < unsigned int, class, class, class, class > template < unsigned int, class, class, class, class >
friend class Combinatorial_map_base; friend class Combinatorial_map_base;
@ -85,7 +85,7 @@ namespace CGAL {
friend struct internal::Reverse_orientation_of_connected_component_functor; friend struct internal::Reverse_orientation_of_connected_component_functor;
public: public:
typedef Dart<d,Refs> Self; typedef Combinatorial_map_dart<d,Refs> Self;
typedef typename Refs::Dart_handle Dart_handle; typedef typename Refs::Dart_handle Dart_handle;
typedef typename Refs::size_type size_type; typedef typename Refs::size_type size_type;
typedef typename Refs::Dart_const_handle Dart_const_handle; typedef typename Refs::Dart_const_handle Dart_const_handle;
@ -209,13 +209,13 @@ namespace CGAL {
/** Default constructor: no real initialisation, /** Default constructor: no real initialisation,
* because this is done in the combinatorial map class. * because this is done in the combinatorial map class.
*/ */
Dart() Combinatorial_map_dart()
{} {}
/** Copy constructor: /** Copy constructor:
* @param adart a dart. * @param adart a dart.
*/ */
Dart(const Dart& adart) : mmarks(adart.mmarks), Combinatorial_map_dart(const Combinatorial_map_dart& adart) : mmarks(adart.mmarks),
mattribute_handles(adart.mattribute_handles) mattribute_handles(adart.mattribute_handles)
{ {
for (unsigned int i = 0; i <= dimension; ++i) for (unsigned int i = 0; i <= dimension; ++i)
@ -241,5 +241,5 @@ namespace CGAL {
} // namespace CGAL } // namespace CGAL
#endif // CGAL_DART_H // #endif // CGAL_COMBINATORIAL_MAP_DART_H //
// EOF // // EOF //

4
Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h
View File

@ -20,7 +20,7 @@
#ifndef CGAL_COMBINATORIAL_MAP_MIN_ITEMS_H #ifndef CGAL_COMBINATORIAL_MAP_MIN_ITEMS_H
#define CGAL_COMBINATORIAL_MAP_MIN_ITEMS_H 1 #define CGAL_COMBINATORIAL_MAP_MIN_ITEMS_H 1
#include <CGAL/Dart.h> #include <CGAL/Combinatorial_map_dart.h>
namespace CGAL { namespace CGAL {
@ -39,7 +39,7 @@ namespace CGAL {
template < class Refs > template < class Refs >
struct Dart_wrapper struct Dart_wrapper
{ {
typedef CGAL::Dart< d, Refs > Dart; typedef CGAL::Combinatorial_map_dart< d, Refs > Dart;
typedef CGAL::cpp11::tuple<> Attributes; typedef CGAL::cpp11::tuple<> Attributes;
}; };
}; };

18
Generalized_map/include/CGAL/Generalized_map_dart.h
View File

@ -17,8 +17,8 @@
// //
// Author(s) : Guillaume Damiand <guillaume.damiand@liris.cnrs.fr> // Author(s) : Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
// //
#ifndef CGAL_GMAP_DART_H #ifndef CGAL_GENERALIZED_MAP_DART_H
#define CGAL_GMAP_DART_H 1 #define CGAL_GENERALIZED_MAP_DART_H 1
#include <CGAL/Compact_container.h> #include <CGAL/Compact_container.h>
#include <CGAL/assertions.h> #include <CGAL/assertions.h>
@ -26,7 +26,7 @@
namespace CGAL { namespace CGAL {
/** @file GMap_dart.h /** @file Generalized_map_dart.h
* Definition of nD dart for generalized maps. * Definition of nD dart for generalized maps.
*/ */
@ -39,14 +39,14 @@ namespace CGAL {
} }
/** Definition of nD dart. /** Definition of nD dart.
* The GMap_dart class describes an nD dart (basic element of a * The Generalized_map_dart class describes an nD dart (basic element of a
* generalized map). A dart is composed with handle towards its neighbors, * generalized map). A dart is composed with handle towards its neighbors,
* a bitset containing Boolean marks, and handle towards enabled attributes. * a bitset containing Boolean marks, and handle towards enabled attributes.
* n is the dimension of the space (2 for 2D, 3 for 3D...) * n is the dimension of the space (2 for 2D, 3 for 3D...)
* Refs the ref class * Refs the ref class
*/ */
template <unsigned int d, typename Refs> template <unsigned int d, typename Refs>
struct GMap_dart struct Generalized_map_dart
{ {
template < unsigned int, class, class, class, class > template < unsigned int, class, class, class, class >
friend class Generalized_map_base; friend class Generalized_map_base;
@ -73,7 +73,7 @@ struct GMap_dart
friend struct internal::link_alpha_functor; friend struct internal::link_alpha_functor;
public: public:
typedef GMap_dart<d,Refs> Self; typedef Generalized_map_dart<d,Refs> Self;
typedef typename Refs::Dart_handle Dart_handle; typedef typename Refs::Dart_handle Dart_handle;
typedef typename Refs::size_type size_type; typedef typename Refs::size_type size_type;
typedef typename Refs::Dart_const_handle Dart_const_handle; typedef typename Refs::Dart_const_handle Dart_const_handle;
@ -180,13 +180,13 @@ protected:
/** Default constructor: no real initialisation, /** Default constructor: no real initialisation,
* because this is done in the generalized map class. * because this is done in the generalized map class.
*/ */
GMap_dart() Generalized_map_dart()
{} {}
/** Copy constructor: /** Copy constructor:
* @param adart a dart. * @param adart a dart.
*/ */
GMap_dart(const GMap_dart& adart) : Generalized_map_dart(const Generalized_map_dart& adart) :
mmarks(adart.mmarks), mmarks(adart.mmarks),
mattribute_handles(adart.mattribute_handles) mattribute_handles(adart.mattribute_handles)
{ {
@ -213,5 +213,5 @@ protected:
} // namespace CGAL } // namespace CGAL
#endif // CGAL_GMAP_DART_H // #endif // CGAL_GENERALIZED_MAP_DART_H //
// EOF // // EOF //