diff --git a/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h b/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h index d82dd8c98b3..035ad905459 100644 --- a/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h +++ b/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMap.h @@ -20,7 +20,7 @@ public: GeneralizedMap(); /*! -Construct a new generalized map from another one. The new generalized map is created by copying the darts and the non void attributes of gmap. GMap must be a model of `GeneralizedMap` concept, which can be defined with a different dimension and/or different attributes than `*this`. In this case, only permutations that are common to `gmap` and `*this`, and only non void i-attributes of `gmap` whose info type is the same to the info of non void i-attributes of `*this`, are copied. +Construct a new generalized map from another one. The new generalized map is created by copying the darts and the non void attributes of gmap. GMap must be a model of `GeneralizedMap` concept, which can be defined with a different dimension and/or different attributes than `*this`. In this case, only involutions that are common to `gmap` and `*this`, and only non void i-attributes of `gmap` whose info type is the same to the info of non void i-attributes of `*this`, are copied. */ template GeneralizedMap(const GMap& gmap); diff --git a/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMapItems.h b/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMapItems.h index 73ea02bd221..4d4bb83f8eb 100644 --- a/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMapItems.h +++ b/Generalized_map/doc/Generalized_map/Concepts/GeneralizedMapItems.h @@ -2,7 +2,7 @@ \ingroup PkgGeneralizedMapsConcepts \cgalConcept -The concept `GeneralizedMapItems` allows to customize a dD generalized map by choosing the type of darts, and by enabling and disabling some attributes. For that, it defines an inner class template named \ref GeneralizedMapItems::GDart_wrapper "GDart_wrapper", with one template parameter, `GMap`, a model of the `GeneralizedMap` concept. This inner class must define two types: `%GDart` and `%Attributes`. +The concept `GeneralizedMapItems` allows to customize a dD generalized map by choosing the type of darts, and by enabling and disabling some attributes. For that, it defines an inner class template named \ref GeneralizedMapItems::GDart_wrapper "GDart_wrapper", with one template parameter, `GMap`, a model of the `GeneralizedMap` concept. This inner class must define two types: `%Dart` and `%Attributes`. \cgalHasModel \ref CGAL::Generalized_map_min_items "CGAL::Generalized_map_min_items" @@ -19,7 +19,7 @@ The concept `GeneralizedMapItems` allows to customize a dD generalized ma template < class GMap > struct GDart_wrapper { - typedef CGAL::GDart<4, GMap> GDart; + typedef CGAL::GDart<4, GMap> Dart; typedef CGAL::cpp11::tuple<> Attributes; }; }; @@ -29,7 +29,7 @@ The concept `GeneralizedMapItems` allows to customize a dD generalized ma template < class GMap > struct GDart_wrapper { - typedef CGAL::GDart<3, GMap> GDart; + typedef CGAL::GDart<3, GMap> Dart; typedef CGAL::Cell_attribute Edge_attrib; typedef CGAL::cpp11::tuple Attributes; }; @@ -43,7 +43,7 @@ public: Wrapper class defining type of darts and types of attributes. The class `%GDart_wrapper` must provide: - - `%GDart_wrapper::%GDart`, the type of dart, a model of the `GDart` concept. + - `%GDart_wrapper::%Dart`, the type of dart, a model of the `GDart` concept. - `%GDart_wrapper::%Attributes` The tuple of attributes, containing at most \ref GeneralizedMap::dimension "GMap::dimension+1" types (one for each possible cell of the generalized map). Each type of the tuple must be either a model of the `CellAttribute` concept or `void`. The first type corresponds to 0-attributes, the second to 1-attributes and so on. If the \f$ i^{\mbox{th}}\f$ type in the tuple is `void`, (i-1)-attributes are disabled. Otherwise, (i-1)-attributes are enabled and have the given type. If the size of the tuple is k, with k<\ref GeneralizedMap::dimension "GMap::dimension+1", \f$ \forall\f$i: k\f$ \leq\f$i\f$ \leq\f$\ref GeneralizedMap::dimension "GMap::dimension", i-attributes are disabled. \note It can be implemented using a nested template class.