diff --git a/Packages/Generator/doc_tex/Generator/generators.tex b/Packages/Generator/doc_tex/Generator/generators.tex index c9060a64b33..bb85380ac43 100644 --- a/Packages/Generator/doc_tex/Generator/generators.tex +++ b/Packages/Generator/doc_tex/Generator/generators.tex @@ -33,7 +33,8 @@ third section documents generators for two-dimensional point sets, the fourth section for three-dimensional point sets. The fifth section presents examples using functions from Section~\ref{sectionGenericFunctions} to generate composed objects -like segments. The sixth section describes ramdom conves sets. +like segments. +%% The sixth section describes random convex sets. Note that the \stl\ algorithm \ccc{random_shuffle} is useful in this context to achieve random permutations for otherwise regular generators (e.g.~points on a grid or segment). @@ -107,7 +108,7 @@ template argument \ccc{Creator} which defaults to the class template arguments must be provided when using these generators.}. The \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point \ccc{(x,y)} of type -\ccc{P}. Predifined implementations for these creators like the +\ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. They simply assume an appropriate constructor for type \ccc{P}. @@ -250,7 +251,7 @@ Grid points are generated by functions writing to an output iterator. the $n$ points. \ccPrecond \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point - \ccc{(x,y)} of type \ccc{P}. Predifined implementations for these + \ccc{(x,y)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. The \ccc{OutputIterator} must accept values of type \ccc{P}. If the @@ -285,7 +286,7 @@ exact predicates to compute the sign of expressions slightly off from zero. Two random numbers are needed from \ccc{rnd} for each point. \ccPrecond \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point - \ccc{(x,y)} of type \ccc{P}. Predifined implementations for these + \ccc{(x,y)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. The \ccc{value_type} of the \ccc{ForwardIterator} must be assignable to \ccc{P}. @@ -321,7 +322,7 @@ a point set. Returns the value of \ccc{first2} after inserting the $n$ points. \ccPrecond \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point - \ccc{(x,y)} of type \ccc{P}. Predifined implementations for these + \ccc{(x,y)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. The \ccc{value_type} of the \ccc{RandomAccessIterator} must be assignable to \ccc{P}. @@ -437,7 +438,7 @@ template argument \ccc{Creator} which defaults to template arguments must be provided when using these generators.}. The \ccc{Creator} must be a function object accepting three \ccc{double} values $x$, $y$ and $z$ and returning an initialized -point \ccc{(x,y,z)} of type \ccc{P}. Predifined implementations for +point \ccc{(x,y,z)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. They simply assume an appropriate constructor for type \ccc{P}. @@ -558,7 +559,7 @@ The second example generates a regular structure of 100 segments, see output. It uses the \ccc{CGAL_Points_on_segment_2} iterator, \ccc{CGAL_Join_input_iterator_2} and \ccc{CGAL_Counting_iterator} to avoid any intermediate storage of the generated objects until they are -used, in this example copied to a windowstream. +used, in this example copied to a window stream. \cprogfile{Segment_generator_prog2.C} @@ -567,7 +568,7 @@ used, in this example copied to a windowstream.
Figure: Output of example program for the generic segment generator using - precomputed point locations. + pre-computed point locations. diff --git a/Packages/Generator/doc_tex/support/Generator/generators.tex b/Packages/Generator/doc_tex/support/Generator/generators.tex index c9060a64b33..bb85380ac43 100644 --- a/Packages/Generator/doc_tex/support/Generator/generators.tex +++ b/Packages/Generator/doc_tex/support/Generator/generators.tex @@ -33,7 +33,8 @@ third section documents generators for two-dimensional point sets, the fourth section for three-dimensional point sets. The fifth section presents examples using functions from Section~\ref{sectionGenericFunctions} to generate composed objects -like segments. The sixth section describes ramdom conves sets. +like segments. +%% The sixth section describes random convex sets. Note that the \stl\ algorithm \ccc{random_shuffle} is useful in this context to achieve random permutations for otherwise regular generators (e.g.~points on a grid or segment). @@ -107,7 +108,7 @@ template argument \ccc{Creator} which defaults to the class template arguments must be provided when using these generators.}. The \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point \ccc{(x,y)} of type -\ccc{P}. Predifined implementations for these creators like the +\ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. They simply assume an appropriate constructor for type \ccc{P}. @@ -250,7 +251,7 @@ Grid points are generated by functions writing to an output iterator. the $n$ points. \ccPrecond \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point - \ccc{(x,y)} of type \ccc{P}. Predifined implementations for these + \ccc{(x,y)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. The \ccc{OutputIterator} must accept values of type \ccc{P}. If the @@ -285,7 +286,7 @@ exact predicates to compute the sign of expressions slightly off from zero. Two random numbers are needed from \ccc{rnd} for each point. \ccPrecond \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point - \ccc{(x,y)} of type \ccc{P}. Predifined implementations for these + \ccc{(x,y)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. The \ccc{value_type} of the \ccc{ForwardIterator} must be assignable to \ccc{P}. @@ -321,7 +322,7 @@ a point set. Returns the value of \ccc{first2} after inserting the $n$ points. \ccPrecond \ccc{Creator} must be a function object accepting two \ccc{double} values $x$ and $y$ and returning an initialized point - \ccc{(x,y)} of type \ccc{P}. Predifined implementations for these + \ccc{(x,y)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. The \ccc{value_type} of the \ccc{RandomAccessIterator} must be assignable to \ccc{P}. @@ -437,7 +438,7 @@ template argument \ccc{Creator} which defaults to template arguments must be provided when using these generators.}. The \ccc{Creator} must be a function object accepting three \ccc{double} values $x$, $y$ and $z$ and returning an initialized -point \ccc{(x,y,z)} of type \ccc{P}. Predifined implementations for +point \ccc{(x,y,z)} of type \ccc{P}. Predefined implementations for these creators like the default can be found in Section~\ref{sectionCreatorFunctionObjects}. They simply assume an appropriate constructor for type \ccc{P}. @@ -558,7 +559,7 @@ The second example generates a regular structure of 100 segments, see output. It uses the \ccc{CGAL_Points_on_segment_2} iterator, \ccc{CGAL_Join_input_iterator_2} and \ccc{CGAL_Counting_iterator} to avoid any intermediate storage of the generated objects until they are -used, in this example copied to a windowstream. +used, in this example copied to a window stream. \cprogfile{Segment_generator_prog2.C} @@ -567,7 +568,7 @@ used, in this example copied to a windowstream.
Figure: Output of example program for the generic segment generator using - precomputed point locations. + pre-computed point locations.