From a46398db32f676a3a10145c4aac62fcab01662a5 Mon Sep 17 00:00:00 2001 From: Ahmed Essam Date: Tue, 25 Aug 2020 13:43:49 +0200 Subject: [PATCH] Address comments --- Envelope_2/doc/Envelope_2/CGAL/envelope_2.h | 12 ++++++------ Envelope_2/include/CGAL/envelope_2.h | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Envelope_2/doc/Envelope_2/CGAL/envelope_2.h b/Envelope_2/doc/Envelope_2/CGAL/envelope_2.h index b2a761b1dc9..7a07ab96e3b 100644 --- a/Envelope_2/doc/Envelope_2/CGAL/envelope_2.h +++ b/Envelope_2/doc/Envelope_2/CGAL/envelope_2.h @@ -47,13 +47,13 @@ Reusing the same traits object improves speed if the traits class caches data. The lower envelope is represented using the output minimization diagram `diag`. \tparam InputIterator must be an input iterator with value type `EnvelopeDiagram::X_monotone_curve_2`. -\tparam Traits must be a model of the concept `ArrangementXMonotoneTraits_2`. \tparam EnvelopeDiagram must be a model of the concept `EnvelopeDiagram_1`. +\tparam Traits must be a model of the concept `ArrangementXMonotoneTraits_2`. */ -template +template void lower_envelope_x_monotone_2 (InputIterator begin, InputIterator end, -const Traits* traits, EnvelopeDiagram& diag); +EnvelopeDiagram& diag, const Traits& traits); } /* namespace CGAL */ @@ -106,12 +106,12 @@ Reusing the same traits object improves speed if the traits class caches data. The upper envelope is represented using the output maximization diagram `diag`. \tparam InputIterator must be an input iterator with value type `EnvelopeDiagram::X_monotone_curve_2`. -\tparam Traits must be a model of the concept `ArrangementXMonotoneTraits_2`. \tparam EnvelopeDiagram must be a model of the concept `EnvelopeDiagram_1`. +\tparam Traits must be a model of the concept `ArrangementXMonotoneTraits_2`. */ -template +template void upper_envelope_x_monotone_2 (InputIterator begin, InputIterator end, -const Traits* traits, EnvelopeDiagram& diag); +EnvelopeDiagram& diag, const Traits& traits); } /* namespace CGAL */ diff --git a/Envelope_2/include/CGAL/envelope_2.h b/Envelope_2/include/CGAL/envelope_2.h index 09db9e88e51..6d23f724393 100644 --- a/Envelope_2/include/CGAL/envelope_2.h +++ b/Envelope_2/include/CGAL/envelope_2.h @@ -97,18 +97,18 @@ void lower_envelope_x_monotone_2 (InputIterator begin, InputIterator end, * Compute the lower envelope of a range of x-monotone curves. * \param begin An iterator for the first x-monotone curve. * \param end A past-the-end iterator for the x-monotone curves. - * \param traits The arrangement traits responsible for the x-monotone curves * \param diag Output: The minimization diagram. + * \param traits The arrangement traits responsible for the x-monotone curves. * \pre The value-type of the iterator is Traits::X_monotone_curve_2. */ -template +template void lower_envelope_x_monotone_2 (InputIterator begin, InputIterator end, - const Traits* traits, EnvelopeDiagram& diag) + EnvelopeDiagram& diag, const Traits& traits) { typedef typename EnvelopeDiagram::Traits_2 Traits_2; typedef Envelope_divide_and_conquer_2 Envelope_2; - Envelope_2 env{traits}; + Envelope_2 env{&traits}; env.insert_x_monotone_curves (begin, end, true, // Lower envelope. @@ -144,18 +144,18 @@ void upper_envelope_x_monotone_2 (InputIterator begin, InputIterator end, * Compute the upper envelope of a range of x-monotone curves. * \param begin An iterator for the first x-monotone curve. * \param end A past-the-end iterator for the x-monotone curves. - * \param traits The arrangement traits responsible for the x-monotone curves * \param diag Output: The maximization diagram. + * \param traits The arrangement traits responsible for the x-monotone curves. * \pre The value-type of the iterator is Traits::X_monotone_curve_2. */ -template +template void upper_envelope_x_monotone_2 (InputIterator begin, InputIterator end, - const Traits* traits, EnvelopeDiagram& diag) + EnvelopeDiagram& diag, const Traits& traits) { typedef typename EnvelopeDiagram::Traits_2 Traits_2; typedef Envelope_divide_and_conquer_2 Envelope_2; - Envelope_2 env{traits}; + Envelope_2 env{&traits}; env.insert_x_monotone_curves (begin, end, false, // Upper envelope.