From 2bfb39b17b46558d8c49f875464967f3026c0157 Mon Sep 17 00:00:00 2001 From: Fernando Cacciola Date: Mon, 8 Oct 2007 15:48:14 +0000 Subject: [PATCH] Small changes to the Manuals --- HalfedgeDS/doc_tex/HalfedgeDS/main.tex | 6 ++-- .../doc_tex/HalfedgeDS_ref/Ccb_intro.tex | 6 ++-- .../doc_tex/HalfedgeDS_ref/Ccb_or_dmr.tex | 4 +-- .../doc_tex/HalfedgeDS_ref/HalfedgeDS.tex | 31 +++++++------------ .../doc_tex/HalfedgeDS_ref/HalfedgeDSCcb.tex | 2 +- .../HalfedgeDS_ref/HalfedgeDSHalfedge.tex | 9 ++---- .../HalfedgeDS_ref/HalfedgeDSItems.tex | 13 ++++---- .../HalfedgeDS_ref/HalfedgeDS_ccb_base.tex | 6 ++-- .../HalfedgeDS_ref/HalfedgeDS_decorator.tex | 7 ++--- .../HalfedgeDS_ref/HalfedgeDS_face_base.tex | 2 +- .../HalfedgeDS_halfedge_base.tex | 6 ++-- .../HalfedgeDS_ref/HalfedgeDS_items_2.tex | 2 +- .../HalfedgeDS_items_with_ccb_2.tex | 2 +- HalfedgeDS/doc_tex/HalfedgeDS_ref/intro.tex | 6 ++-- .../examples/HalfedgeDS/hds_prog_color.cpp | 2 +- .../examples/HalfedgeDS/hds_prog_compact.cpp | 6 +--- .../examples/HalfedgeDS/hds_prog_compact2.cpp | 6 +--- .../examples/HalfedgeDS/hds_prog_default.cpp | 2 +- .../HalfedgeDS/hds_prog_default_with_ccb.cpp | 4 +-- .../HalfedgeDS/hds_prog_edge_iterator.cpp | 2 +- .../examples/HalfedgeDS/hds_prog_graph.cpp | 2 +- .../examples/HalfedgeDS/hds_prog_graph2.cpp | 2 +- .../HalfedgeDS/hds_prog_graph_with_ccb.cpp | 2 +- .../HalfedgeDS/hds_prog_halfedge_iterator.cpp | 6 ++-- .../examples/HalfedgeDS/hds_prog_vector.cpp | 6 +--- 25 files changed, 60 insertions(+), 82 deletions(-) diff --git a/HalfedgeDS/doc_tex/HalfedgeDS/main.tex b/HalfedgeDS/doc_tex/HalfedgeDS/main.tex index 1f388e82e30..2aebe80222e 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS/main.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS/main.tex @@ -15,7 +15,7 @@ \ccUserChapter{Halfedge Data Structures \label{chapterHalfedgeDS}} \ccChapterRelease{\hdsRev. \ \hdsDate} -\ccChapterAuthor{Lutz Kettner \and Fernando Cacciola} +\ccChapterAuthor{Lutz Kettner} \input{HalfedgeDS/PkgDescription} @@ -102,7 +102,7 @@ in~\cite{k-ugpdd-99}. } \end{center} \caption{Responsibilities of the different layers in the - halfedge data-structure design [NEEDS TO BE UPDATED TO INCORPORATE CCBS].} + halfedge data-structure design [NEEDS TO BE UPDATED TO INCORPORATE HALFEDGE-CYCLES].} \label{figureHalfedgeDSDesign} \end{figure} \end{ccTexOnly} @@ -113,7 +113,7 @@ in~\cite{k-ugpdd-99}. Halfedge Data-Structure Design
Figure: Responsibilities of the different layers in the - halfedge data-structure design [NEEDS TO BE UPDATED TO INCORPORATE CCBS]. + halfedge data-structure design [NEEDS TO BE UPDATED TO INCORPORATE HALFEDGE-CYCLES].

\end{ccHtmlOnly} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_intro.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_intro.tex index 3721e056c2d..8ada074a082 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_intro.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_intro.tex @@ -37,7 +37,7 @@ halfedge cycle in turn stores a reference to a halfedge\footnote{In other hole-supporting HDS designs, faces stores a sequence of halfedges (each for a different cycle). In our design a cycle is given by a \ccc{halfedge_cycle} instead of a \ccc{halfedge} to allow the centralization of cycle-related information}. -A face also stores another sequence of references to halfedge_cycles for isolated vertices, where +A face also stores another sequence of references to halfedge\_cycles for isolated vertices, where each such vertex is represented by a cycle composed of a single-halfedge single-vertex self-loop. A halfedge in the cycle stores the handle to the halfedge cycle it belongs to. @@ -45,9 +45,9 @@ A halfedge in the cycle stores the handle to the halfedge cycle it belongs to. can have many cycles, not just one; or oven no outer boudary but only inner cycles (holes). \ccc{Halfedge::face()} on the other hand is well defined as a shortcut for \ccc{Halfedge::halfedge_cycle()->face()} -since every halfedge belongs to a halfedge_cycle. +since every halfedge belongs to a halfedge\_cycle. -THe type \ccc{Halfedge_cycle} is a first-class \ccc{HDS} item, just like vertices, halfedges and faces. +The type \ccc{Halfedge_cycle} is a first-class \ccc{HDS} item, just like vertices, halfedges and faces. However, the halfedge cycles do not contribute by themself to the incidence information maintained by the \ccc{HDS}. That is, the incidence is betwen vertices, edges and faces, which are all well defined mathematical concepts belonging to the field of algebraic topology. diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_or_dmr.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_or_dmr.tex index b7c70733abc..6124d984143 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_or_dmr.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/Ccb_or_dmr.tex @@ -1,5 +1,5 @@ This design supports two {\em mutually exclusive} methods for storing the incidence relationship between faces and halfedges: -{\em direct mutual reference}, that is, having faces and halfedges reference -each other directly, or {\em through a common \ccc{halfedge_cycle}}. +direct-mutual-reference (having faces and halfedges reference +each other directly) or through a common \ccc{halfedge_cycle}. diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS.tex index fd4f32e8f55..d69d0f5a93a 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS.tex @@ -47,12 +47,12 @@ in~\cite{k-ugpdd-99}. {\XHDS Each edge is decomposed into two halfedges with opposite orientations and each cycle of connected halfedges is associated with a single object -named \ccc{halfedge_cycle}. +named halfedge\_cycle. One incident vertex is stored in each halfedge and one incident halfedge is stored in each vertex. Incidence information between halfedges and faces can be stored via two mutually exclusive mechanisms: directly storing an incident halfedge in a face -and vice versa, or via a \ccc{halfedge_cycle} object common to incident faces and halfedges. +and vice versa, or via a halfedge\_cycle object common to incident faces and halfedges. } Reduced variants of the halfedge data structure can omit some of these information, for example the halfedge pointers in faces or the @@ -76,7 +76,7 @@ possible for vertices, halfedges, and faces. \protect\ccc{Halfedge}, and \protect\ccc{Face} of the halfedge data structure. Member functions with shaded background are mandatory. The others - are optionally supported. [NEEDS TO BE UPDATED TO INCORPORATE CCBS]} + are optionally supported. [NEEDS TO BE UPDATED TO INCORPORATE HALFEDGE-CYCLES]} \label{figureOptionalMethods} \end{figure} \end{ccTexOnly} @@ -91,7 +91,7 @@ possible for vertices, halfedges, and faces. The three classes Vertex, Halfedge, and Face of the halfedge data structure. Member functions with shaded background are mandatory. The others - are optionally supported [NEEDS TO BE UPDATED TO INCORPORATE CCBS]. + are optionally supported [NEEDS TO BE UPDATED TO INCORPORATE HALFEDGE-CYCLES]. \end{ccHtmlOnly} @@ -228,20 +228,14 @@ The following dependencies among these options must be regarded: Vertices are supported $\Longleftrightarrow$ \ccc{Supports_halfedge_vertex} $\equiv$ \ccc{CGAL::Tag_true}. -\textbf{Faces are supported $\Longleftrightarrow$ -Supports\_halfedge\_face $\equiv$ CGAL::Tag\_true -or -( Supports\_halfedge\_halfedge\_cycle $\equiv$ CGAL::Tag\_true -and Supports\_halfedge\_cycle\_face $\equiv$ CGAL::Tag\_true ) -} +Faces are supported $\Longleftrightarrow$ +\ccc{Supports_halfedge_face} $\equiv$ \ccc{CGAL::Tag_true} +or \ccc{Supports_halfedge_halfedge_cycle} $\equiv$ \ccc{CGAL::Tag_true} + +Halfedge\_cycles are supported $\Longleftrightarrow$ +\ccc{Supports_halfedge_halfedge_cycle} $\equiv$ \ccc{CGAL::Tag_true} +and \ccc{Supports_face_halfedge_cycle} $\equiv$ \ccc{CGAL::Tag_true} -\textbf{Halfedge\_cycles are supported $\Longleftrightarrow$ -Supports\_halfedge\_halfedge\_cycle $\equiv$ -CGAL::Tag\_true -and -Supports\_face\_halfedge\_cycle -$\equiv$ CGAL::Tag\_true -} \ccc{Supports_vertex_halfedge} $\equiv$ \ccc{CGAL::Tag_true} $\Longrightarrow$ \ccc{Supports_halfedge_vertex} $\equiv$ \ccc{CGAL::Tag_true}. @@ -252,9 +246,6 @@ $\equiv$ CGAL::Tag\_true \ccc{Supports_face_halfedge} $\equiv$ \ccc{CGAL::Tag_true} $\Longrightarrow$ \ccc{Supports_halfedge_face} $\equiv$ \ccc{CGAL::Tag_true}. -\textbf{Supports\_face\_halfedge\_cycle $\equiv$ CGAL::Tag\_true $\Longrightarrow$ -Supports\_halfedge\_cycle\_face $\equiv$ CGAL::Tag\_true}. - \end{ccAdvanced} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSCcb.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSCcb.tex index 4db936c77f9..aeb78d6c7d1 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSCcb.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSCcb.tex @@ -32,7 +32,7 @@ A \ccRefName\ stores a reference to one of the halfedges in the cycle (which one It optionally stores a reference to the face it belongs to. A type tag indicates whether the related member functions are supported. -All the halfedges connected to the one referenced in a \ccRefName\ must form a cycle, not just a path, and they all must be incident to the same face (or no face at all for a border cycle). +All the halfedges connected to the one referenced in a \ccRefName\ must form a cycle, not just a path. Two halfedges are allowed to be in the same cycle even if they are opposite to each other. This allows models of \ccRefName\ to represent open curves, antennas and empty alleys by simply arranging diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex index 7f381dbf968..29f38ed8bd8 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex @@ -212,11 +212,8 @@ protection could be bypassed also by an user, but not by accident.) sets the \ccc{halfedge_cycle} to $c$.} \ccHeading{Operations available if \ccc{Supports_halfedge_face} $\equiv$ \ccc{CGAL::Tag_true} - $or$ - ( \ccc{Supports_halfedge_halfedge_cycle} $\equiv$ \ccc{CGAL::Tag_true} - $and$ - \ccc{Supports_halfedge_cycle_face} $\equiv$ \ccc{CGAL::Tag_true} - ) } + or \ccc{Supports_halfedge_halfedge_cycle} $\equiv$ \ccc{CGAL::Tag_true} + } \ccMethod{Face_handle face();}{} \ccGlue @@ -238,7 +235,7 @@ protection could be bypassed also by an user, but not by accident.) \ccRefConceptPage{HalfedgeDS}\\ \ccRefConceptPage{HalfedgeDSItems}\\ \ccRefConceptPage{HalfedgeDSVertex}\\ -\ccRefConceptPage{HalfedgeDSFace} +\ccRefConceptPage{HalfedgeDSFace}\\ \ccRefConceptPage{HalfedgeDSHalfedgeCycle} \end{ccRefConcept} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSItems.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSItems.tex index ea6a0662442..26c5a5b7eeb 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSItems.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSItems.tex @@ -73,26 +73,27 @@ and page~\pageref{pageHalfedgeDSItemsFaceRef} respectively. \ccExample The following example shows the canonical implementation of the -\ccc{CGAL::HalfedgeDS_min_items} class. It uses the base classes for the +\ccc{CGAL::HalfedgeDS_items_with_halfedge_cycle_2} class. It uses the base classes for the item types that are provided in the library. \begin{ccExampleCode} -struct HalfedgeDS_min_items { +struct HalfedgeDS_items_with_halfedge_cycles_2 { template < class Refs, class Traits> struct Vertex_wrapper { - typedef CGAL::HalfedgeDS_vertex_min_base< Refs> Vertex; + typedef typename Traits::Point_2 Point; + typedef CGAL::HalfedgeDS_vertex_base< Refs, Tag_true, Point> Vertex; }; template < class Refs, class Traits> struct Halfedge_wrapper { - typedef CGAL::HalfedgeDS_halfedge_min_base< Refs> Halfedge; + typedef CGAL::HalfedgeDS_halfedge_base< Refs, Tag_true, Tag_true, Tag_false, Tag_true> Halfedge; }; template < class Refs, class Traits> struct Face_wrapper { - typedef CGAL::HalfedgeDS_face_min_base< Refs> Face; + typedef CGAL::HalfedgeDS_face_base< Refs, Tag_false, Tag_false, Tag_true> Face; }; template < class Refs, class Traits> struct Halfedge_cycle_wrapper { - typedef int Halfedge_cycle; + typedef CGAL::HalfedgeDS_halfedge_cycle_base< Refs> Halfedge_cycle; }; }; \end{ccExampleCode} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_ccb_base.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_ccb_base.tex index 38a9730b564..d2709b7eb5b 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_ccb_base.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_ccb_base.tex @@ -20,15 +20,15 @@ The class \ccRefName\ is a model of the \ccc{HalfedgeDSHalfedgeCycle} concept. \ccc{Refs} is an instantiation of a \ccc{HalfedgeDS}. -The full declaration states four template parameters: +The full declaration states one template parameters: \begin{tabbing} -\mbox{}~~~~~~ \= \ccc{template <} \=\ccc{class Refs,}\\ +\mbox{}~~~~~~ \= \ccc{template <} \=\ccc{class Refs >} \\ \> \ccc{class HalfedgeDS_halfedge_cycle_base;} \end{tabbing} -In all cases, a reference to the halfedge and face is supported. +A reference to the halfedge and face is supported. %\ccInclude{CGAL/HalfedgeDS_halfedge_cycle_base.h} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_decorator.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_decorator.tex index 13d1f067d20..508b33bc7d3 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_decorator.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_decorator.tex @@ -77,15 +77,14 @@ all halfedge data structures and will not appear here again. \ccMethod{Halfedge_handle create_loop();}{ returns the handle of a halfedge from a newly created loop in \ccc{hds} - consisting of a single closed edge, one vertex and two faces - {\XHDS each with one outer halfedge cycle} - (if supported respectively).} + consisting of a single closed edge, one vertex and two faces (if supported), + {\XHDS each with one outer halfedge cycle (if supported).}} \ccGlue \ccMethod{Halfedge_handle create_segment();}{ returns a halfedge from a newly created segment in \ccc{hds} consisting of a single open edge, two vertices, one face {\XHDS and one outer halfedge cycle} - (if supported respectively).} + (if supported).} \ccGlue \ccMethod{\XHDS Halfedge_handle create_isolated_vertex();}{\XHDS returns handle of a halfedge from a newly created loop in \ccc{hds} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_face_base.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_face_base.tex index 85e670a8b82..57af94b47fd 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_face_base.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_face_base.tex @@ -29,7 +29,7 @@ defaults that allow to select various flavors of faces. \mbox{}~~~~~~ \= \ccc{template <} \=\ccc{class Refs,}\\ \> \>\ccc{class Tag_halfedge } \mbox{}~~~ \=\ccc{= CGAL::Tag_true,}\\ \> \>\ccc{class Tag_plane } \>\ccc{= CGAL::Tag_false,}\\ - \> \>\ccc{class Tag_halfedge_cycle} \>\ccc{= CGAL::Tag_true}\\ + \> \>\ccc{class Tag_halfedge_cycle} \>\ccc{= CGAL::Tag_true >}\\ \> \ccc{class HalfedgeDS_face_base;} \end{tabbing} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_halfedge_base.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_halfedge_base.tex index 5c6bd586f92..fffff79e59b 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_halfedge_base.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_halfedge_base.tex @@ -25,9 +25,9 @@ The full declaration states four template parameters: \begin{tabbing} \mbox{}~~~~~~ \= \ccc{template <} \=\ccc{class Refs,}\\ \> \>\ccc{class Tag_prev } \=\ccc{= CGAL::Tag_true,}\\ - \> \>\ccc{class Tag_vertex } \>\ccc{= CGAL::Tag_true,}\\ - \> \>\ccc{class Tag_face } \>\ccc{= CGAL::Tag_true,}\\ - \> \>\ccc{class Tag_halfedge_cycle} \>\ccc{= CGAL::Tag_false}\\ + \> \>\ccc{class Tag_vertex } \> \ccc{= CGAL::Tag_true,}\\ + \> \>\ccc{class Tag_face } \> \ccc{= CGAL::Tag_true,}\\ + \> \>\ccc{class Tag_halfedge_cycle} \> \ccc{= CGAL::Tag_false >}\\ \> \ccc{class HalfedgeDS_halfedge_base;} \end{tabbing} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_2.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_2.tex index 91193ce8668..5112a2dc62e 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_2.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_2.tex @@ -24,7 +24,7 @@ It uses the default types for vertices, halfedges, and faces that declare all incidences supported by a \ccc{HalfedgeDS}. {\XHDS Halfedge cycles are not supported. The vertex also contains a point of type \ccc{Traits::Point_2}, -where \ccc{Traits} is the template argument of the corresponding \ccc{HalfedgeDS}. +where \ccc{Traits} is the template argument of the corresponding \ccc{HalfedgeDS}}. \ccInclude{CGAL/HalfedgeDS_items_2.h} diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_with_ccb_2.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_with_ccb_2.tex index c8e2d3998e2..3169068ad5f 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_with_ccb_2.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDS_items_with_ccb_2.tex @@ -52,7 +52,7 @@ Notice the type tags for the halfedge and face wrapper which select halfedge\_cycles. \begin{ccExampleCode} -struct HalfedgeDS_items_2 { +struct HalfedgeDS_items_with_halfedge_cycles_2 { template < class Refs, class Traits> struct Vertex_wrapper { typedef typename Traits::Point_2 Point; diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/intro.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/intro.tex index 70c52b2fa46..0b792e788d6 100644 --- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/intro.tex +++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/intro.tex @@ -11,7 +11,7 @@ \ccRefChapter{Halfedge Data Structure} %\section{Reference Pages for Halfedge Data Structure\label{chapterHalfedgeDSRef}} \ccChapterRelease{\halfedgeDSRefRev. \ \halfedgeDSRefDate} -\ccChapterAuthor{Lutz Kettner \and Fernando Cacciola} +\ccChapterAuthor{Lutz Kettner} % +------------------------------------------------------------------------+ @@ -23,7 +23,9 @@ combinatorial data structure, geometric interpretation is added by classes built on top of the halfedge data structure. These classes might be more convenient to use than the halfedge data structure directly, since the halfedge data structure is meant as an -implementation layer. See for example the \ccc{CGAL::Polyhedron_3} +implementation layer. See for example the \ccc{CGAL::Polyhedron_3}\begin{center} + + \end{center} class in Chapter~\ref{chapterPolyhedronRef}. The data structure provided here is known as the diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_color.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_color.cpp index 87f415c4881..35300c92bab 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_color.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_color.cpp @@ -22,7 +22,7 @@ struct My_traits { // arbitrary point type, not used here. typedef int Point_2; }; -typedef CGAL_HALFEDGEDS_DEFAULT HDS; +typedef CGAL::HalfedgeDS_default HDS; typedef HDS::Face Face; typedef HDS::Face_handle Face_handle; diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact.cpp index 5d11393031b..2c6844a496b 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact.cpp @@ -92,11 +92,7 @@ struct My_items : public CGAL::HalfedgeDS_items_2 { }; struct Traits { typedef int Point_2; }; -#ifndef CGAL_CFG_NO_TMPL_IN_TMPL_PARAM - typedef CGAL::HalfedgeDS_vector HDS; -#else - typedef CGAL::HalfedgeDS_vector::HDS HDS; -#endif +typedef CGAL::HalfedgeDS_vector HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() { diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp index 892f5eb5d0b..ff101610451 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp @@ -91,11 +91,7 @@ struct My_items : public CGAL::HalfedgeDS_items_2 { }; struct Traits { typedef int Point_2; }; -#ifndef CGAL_CFG_NO_TMPL_IN_TMPL_PARAM - typedef CGAL::HalfedgeDS_list HDS; -#else - typedef CGAL::HalfedgeDS_list::HDS HDS; -#endif +typedef CGAL::HalfedgeDS_list HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() { diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_default.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_default.cpp index 7fc3427cf97..766d8d287ce 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_default.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_default.cpp @@ -2,7 +2,7 @@ #include struct Traits { typedef int Point_2; }; -typedef CGAL_HALFEDGEDS_DEFAULT HDS; +typedef CGAL::HalfedgeDS_default HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() { diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_default_with_ccb.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_default_with_ccb.cpp index 12c89ee5232..a48a326c227 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_default_with_ccb.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_default_with_ccb.cpp @@ -1,9 +1,9 @@ #include #include -#include +#include struct Traits { typedef int Point_2; }; -typedef CGAL_HALFEDGEDS_DEFAULT HDS; +typedef CGAL::HalfedgeDS_default HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() { diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_edge_iterator.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_edge_iterator.cpp index edbc0a82dc6..494552136f6 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_edge_iterator.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_edge_iterator.cpp @@ -3,7 +3,7 @@ #include struct Traits { typedef int Point_2; }; -typedef CGAL_HALFEDGEDS_DEFAULT HDS; +typedef CGAL::HalfedgeDS_default HDS; typedef CGAL::HalfedgeDS_decorator Decorator; typedef HDS::Halfedge_iterator Halfedge_iterator; typedef CGAL::N_step_adaptor< Halfedge_iterator, 2> Iterator; diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph.cpp index 92b27d5a47b..32c087268ea 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph.cpp @@ -3,7 +3,7 @@ #include // no traits needed, argument can be arbitrary dummy. -typedef CGAL_HALFEDGEDS_DEFAULT HDS; +typedef CGAL::HalfedgeDS_default HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() { diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph2.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph2.cpp index c4895fcb8de..e33ec754b24 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph2.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph2.cpp @@ -15,7 +15,7 @@ struct My_items : public CGAL::HalfedgeDS_min_items { }; // no traits needed, argument can be arbitrary dummy. -typedef CGAL_HALFEDGEDS_DEFAULT HDS; +typedef CGAL::HalfedgeDS_default HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() { diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph_with_ccb.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph_with_ccb.cpp index 9a3d43325c5..c2852fe9744 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph_with_ccb.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_graph_with_ccb.cpp @@ -3,7 +3,7 @@ #include // no traits needed, argument can be arbitrary dummy. -typedef CGAL_HALFEDGEDS_DEFAULT HDS; +typedef CGAL::HalfedgeDS_default HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() { diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_halfedge_iterator.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_halfedge_iterator.cpp index 3b016824e79..f1aea66723c 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_halfedge_iterator.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_halfedge_iterator.cpp @@ -2,9 +2,9 @@ #include struct Traits { typedef int Point_2; }; -typedef CGAL_HALFEDGEDS_DEFAULT HDS; -typedef CGAL::HalfedgeDS_decorator Decorator; -typedef HDS::Halfedge_iterator Iterator; +typedef CGAL::HalfedgeDS_default HDS; +typedef CGAL::HalfedgeDS_decorator Decorator; +typedef HDS::Halfedge_iterator Iterator; int main() { HDS hds; diff --git a/HalfedgeDS/examples/HalfedgeDS/hds_prog_vector.cpp b/HalfedgeDS/examples/HalfedgeDS/hds_prog_vector.cpp index f27968ee208..6e7fab933bb 100644 --- a/HalfedgeDS/examples/HalfedgeDS/hds_prog_vector.cpp +++ b/HalfedgeDS/examples/HalfedgeDS/hds_prog_vector.cpp @@ -3,11 +3,7 @@ #include struct Traits { typedef int Point_2; }; -#ifndef CGAL_CFG_NO_TMPL_IN_TMPL_PARAM -typedef CGAL::HalfedgeDS_vector < Traits, CGAL::HalfedgeDS_items_2> HDS; -#else -typedef CGAL::HalfedgeDS_vector::HDS< Traits, CGAL::HalfedgeDS_items_2> HDS; -#endif +typedef CGAL::HalfedgeDS_vector< Traits, CGAL::HalfedgeDS_items_2> HDS; typedef CGAL::HalfedgeDS_decorator Decorator; int main() {