From 83d48e6bd3ffd3b628fc024f5218b065c38b93b8 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Mon, 29 Jan 2024 22:36:48 +0200 Subject: [PATCH] Cleaned up; replaced 'typedef' with 'using' --- Envelope_3/include/CGAL/envelope_3.h | 113 ++++++++++++--------------- 1 file changed, 50 insertions(+), 63 deletions(-) diff --git a/Envelope_3/include/CGAL/envelope_3.h b/Envelope_3/include/CGAL/envelope_3.h index 20cee65f047..7f0bccc2bbc 100644 --- a/Envelope_3/include/CGAL/envelope_3.h +++ b/Envelope_3/include/CGAL/envelope_3.h @@ -8,8 +8,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // // -// Author(s) : Ron Wein -// Baruch Zukerman +// Author(s) : Ron Wein +// Baruch Zukerman +// Efi Fogel #ifndef CGAL_ENVELOPE_3_H #define CGAL_ENVELOPE_3_H @@ -23,100 +24,86 @@ namespace CGAL { -/*! - * Construct the lower envelope of a given set of surfaces. +/*! Construct the lower envelope of a given set of surfaces. * \param begin An iterator for the first surface. * \param end A past-the-end iterator for the surfaces in the range. * \param min_diag Output: The minimization diagram. * \pre The value-type of InputIterator is Traits::Surface_3. */ -template -void lower_envelope_3 (InputIterator begin, InputIterator end, - Envelope_diagram_on_surface_2& - min_diagram) -{ - typedef GeomTraits Traits_3; - typedef typename Envelope_diagram_on_surface_2::Arrangement Envelope_diagram_2; - typedef Envelope_divide_and_conquer_3 - Envelope_algorithm; - Envelope_algorithm env_alg (min_diagram.geometry_traits(), ENVELOPE_LOWER); - env_alg.construct_lu_envelope (begin, end, min_diagram); +template +void lower_envelope_3(InputIterator begin, InputIterator end, + Envelope_diagram_on_surface_2& + min_diagram) { + using Gt = GeomTraits; + using Tt = TopolTraits; + + using Edos_2 = Envelope_diagram_on_surface_2; + using Ed = typename Edos_2::Arrangement; + using Envelope_algorithm = Envelope_divide_and_conquer_3; + Envelope_algorithm env_alg(min_diagram.geometry_traits(), ENVELOPE_LOWER); + env_alg.construct_lu_envelope(begin, end, min_diagram); } -/*! - * Construct the upper envelope of a given set of surfaces. +/*! Construct the upper envelope of a given set of surfaces. * \param begin An iterator for the first surface. * \param end A past-the-end iterator for the surfaces in the range. * \param max_diag Output: The maximization diagram. * \pre The value-type of InputIterator is Traits::Surface_3. */ -template -void upper_envelope_3 (InputIterator begin, InputIterator end, - Envelope_diagram_on_surface_2& - max_diagram) -{ - typedef GeomTraits Traits_3; - typedef typename Envelope_diagram_on_surface_2< - Traits_3, TopTraits>::Arrangement Envelope_diagram_2; - typedef Envelope_divide_and_conquer_3 - Envelope_algorithm; +template +void upper_envelope_3(InputIterator begin, InputIterator end, + Envelope_diagram_on_surface_2& + max_diagram) { + using Gt = GeomTraits; + using Tt = TopolTraits; - Envelope_algorithm env_alg (max_diagram.geometry_traits(), ENVELOPE_UPPER); + using Edos = Envelope_diagram_on_surface_2; + using Ed = typename Edos::Arrangement; + using Envelope_algorithm = Envelope_divide_and_conquer_3; + Envelope_algorithm env_alg(max_diagram.geometry_traits(), ENVELOPE_UPPER); env_alg.construct_lu_envelope (begin, end, max_diagram); } -/*! - * Construct the lower envelope of a given set of xy_monotone surfaces. +/*! Construct the lower envelope of a given set of xy_monotone surfaces. * \param begin An iterator for the first xy-monotone surface. * \param end A past-the-end iterator for the xy_monotone surfaces in the range. * \param min_diag Output: The minimization diagram. * \pre The value-type of InputIterator is GeomTraits::Surface_3. */ -template -void -lower_envelope_xy_monotone_3 (InputIterator begin, InputIterator end, - Envelope_diagram_on_surface_2& min_diagram) -{ - typedef GeomTraits Traits_3; - typedef typename Envelope_diagram_on_surface_2< - Traits_3, TopTraits>::Arrangement Envelope_diagram_2; - typedef Envelope_divide_and_conquer_3 - Envelope_algorithm; - Envelope_algorithm env_alg (min_diagram.geometry_traits(), ENVELOPE_LOWER); +template +void lower_envelope_xy_monotone_3(InputIterator begin, InputIterator end, + Envelope_diagram_on_surface_2 + & min_diagram) { + using Gt = GeomTraits; + using Tt = TopolTraits; + + using Edos = Envelope_diagram_on_surface_2; + using Ed = typename Edos::Arrangement; + using Envelope_algorithm = Envelope_divide_and_conquer_3; + Envelope_algorithm env_alg(min_diagram.geometry_traits(), ENVELOPE_LOWER); env_alg.construct_envelope_xy_monotone (begin, end, min_diagram); } -/*! - * Construct the upper envelope of a given set of xy_monotone surfaces. +/*! Construct the upper envelope of a given set of xy_monotone surfaces. * \param begin An iterator for the first xy_monotone surface. * \param end A past-the-end iterator for the xy_monotone surfaces in the range. * \param max_diag Output: The maximization diagram. * \pre The value-type of InputIterator is Traits::Surface_3. */ -template -void -upper_envelope_xy_monotone_3 (InputIterator begin, InputIterator end, - Envelope_diagram_on_surface_2& max_diagram) -{ - typedef GeomTraits Traits_3; - typedef typename Envelope_diagram_on_surface_2< - Traits_3, TopTraits>::Arrangement Envelope_diagram_2; - typedef Envelope_divide_and_conquer_3 - Envelope_algorithm; +template +void upper_envelope_xy_monotone_3(InputIterator begin, InputIterator end, + Envelope_diagram_on_surface_2 + & max_diagram) { + using Gt = GeomTraits; + using Tt = TopolTraits; - Envelope_algorithm env_alg (max_diagram.geometry_traits(), ENVELOPE_UPPER); + using Edos = Envelope_diagram_on_surface_2; + using Ed = typename Edos::Arrangement; + using Envelope_algorithm = Envelope_divide_and_conquer_3; + Envelope_algorithm env_alg(max_diagram.geometry_traits(), ENVELOPE_UPPER); env_alg.construct_envelope_xy_monotone (begin, end, max_diagram); - - return; }