songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up; replaced 'typedef' with 'using'

This commit is contained in:
Efi Fogel 2024-01-29 22:36:48 +02:00
parent 7381e39e1f
commit 83d48e6bd3
1 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
Envelope_3/include/CGAL/envelope_3.h
View File

@ -8,8 +8,9 @@
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //
// //
// Author(s) : Ron Wein <wein@post.tau.ac.il> // Author(s) : Ron Wein <wein@post.tau.ac.il>
// Baruch Zukerman <baruchzu@post.tau.ac.il> // Baruch Zukerman <baruchzu@post.tau.ac.il>
// Efi Fogel <efifogel@gmail.com>
#ifndef CGAL_ENVELOPE_3_H #ifndef CGAL_ENVELOPE_3_H
#define CGAL_ENVELOPE_3_H #define CGAL_ENVELOPE_3_H
@ -23,100 +24,86 @@
namespace CGAL { 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 begin An iterator for the first surface.
* \param end A past-the-end iterator for the surfaces in the range. * \param end A past-the-end iterator for the surfaces in the range.
* \param min_diag Output: The minimization diagram. * \param min_diag Output: The minimization diagram.
* \pre The value-type of InputIterator is Traits::Surface_3. * \pre The value-type of InputIterator is Traits::Surface_3.
*/ */
template <typename InputIterator, typename GeomTraits, template <typename InputIterator, typename GeomTraits, typename TopolTraits>
class TopTraits> void lower_envelope_3(InputIterator begin, InputIterator end,
void lower_envelope_3 (InputIterator begin, InputIterator end, Envelope_diagram_on_surface_2<GeomTraits, TopolTraits>&
Envelope_diagram_on_surface_2<GeomTraits, TopTraits>& min_diagram) {
min_diagram) using Gt = GeomTraits;
{ using Tt = TopolTraits;
typedef GeomTraits Traits_3;
typedef typename Envelope_diagram_on_surface_2<Traits_3, using Edos_2 = Envelope_diagram_on_surface_2<Gt, Tt>;
TopTraits>::Arrangement Envelope_diagram_2; using Ed = typename Edos_2::Arrangement;
typedef Envelope_divide_and_conquer_3<Traits_3, Envelope_diagram_2> using Envelope_algorithm = Envelope_divide_and_conquer_3<Gt, Ed>;
Envelope_algorithm; Envelope_algorithm env_alg(min_diagram.geometry_traits(), ENVELOPE_LOWER);
Envelope_algorithm env_alg (min_diagram.geometry_traits(), ENVELOPE_LOWER); env_alg.construct_lu_envelope(begin, end, min_diagram);
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 begin An iterator for the first surface.
* \param end A past-the-end iterator for the surfaces in the range. * \param end A past-the-end iterator for the surfaces in the range.
* \param max_diag Output: The maximization diagram. * \param max_diag Output: The maximization diagram.
* \pre The value-type of InputIterator is Traits::Surface_3. * \pre The value-type of InputIterator is Traits::Surface_3.
*/ */
template <class InputIterator, class GeomTraits, template <typename InputIterator, typename GeomTraits, typename TopolTraits>
class TopTraits> void upper_envelope_3(InputIterator begin, InputIterator end,
void upper_envelope_3 (InputIterator begin, InputIterator end, Envelope_diagram_on_surface_2<GeomTraits, TopolTraits>&
Envelope_diagram_on_surface_2<GeomTraits, TopTraits>& max_diagram) {
max_diagram) using Gt = GeomTraits;
{ using Tt = TopolTraits;
typedef GeomTraits Traits_3;
typedef typename Envelope_diagram_on_surface_2<
Traits_3, TopTraits>::Arrangement Envelope_diagram_2;
typedef Envelope_divide_and_conquer_3<Traits_3, Envelope_diagram_2>
Envelope_algorithm;
Envelope_algorithm env_alg (max_diagram.geometry_traits(), ENVELOPE_UPPER); using Edos = Envelope_diagram_on_surface_2<Gt, Tt>;
using Ed = typename Edos::Arrangement;
using Envelope_algorithm = Envelope_divide_and_conquer_3<Gt, Ed>;
Envelope_algorithm env_alg(max_diagram.geometry_traits(), ENVELOPE_UPPER);
env_alg.construct_lu_envelope (begin, end, max_diagram); 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 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 end A past-the-end iterator for the xy_monotone surfaces in the range.
* \param min_diag Output: The minimization diagram. * \param min_diag Output: The minimization diagram.
* \pre The value-type of InputIterator is GeomTraits::Surface_3. * \pre The value-type of InputIterator is GeomTraits::Surface_3.
*/ */
template <class InputIterator, class GeomTraits, template <typename InputIterator, typename GeomTraits, typename TopolTraits>
class TopTraits> void lower_envelope_xy_monotone_3(InputIterator begin, InputIterator end,
void Envelope_diagram_on_surface_2
lower_envelope_xy_monotone_3 (InputIterator begin, InputIterator end, <GeomTraits, TopolTraits>& min_diagram) {
Envelope_diagram_on_surface_2<GeomTraits, using Gt = GeomTraits;
TopTraits>& min_diagram) using Tt = TopolTraits;
{
typedef GeomTraits Traits_3; using Edos = Envelope_diagram_on_surface_2<Gt, Tt>;
typedef typename Envelope_diagram_on_surface_2< using Ed = typename Edos::Arrangement;
Traits_3, TopTraits>::Arrangement Envelope_diagram_2; using Envelope_algorithm = Envelope_divide_and_conquer_3<Gt, Ed>;
typedef Envelope_divide_and_conquer_3<Traits_3, Envelope_diagram_2> Envelope_algorithm env_alg(min_diagram.geometry_traits(), ENVELOPE_LOWER);
Envelope_algorithm;
Envelope_algorithm env_alg (min_diagram.geometry_traits(), ENVELOPE_LOWER);
env_alg.construct_envelope_xy_monotone (begin, end, min_diagram); 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 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 end A past-the-end iterator for the xy_monotone surfaces in the range.
* \param max_diag Output: The maximization diagram. * \param max_diag Output: The maximization diagram.
* \pre The value-type of InputIterator is Traits::Surface_3. * \pre The value-type of InputIterator is Traits::Surface_3.
*/ */
template <class InputIterator, class GeomTraits, template <typename InputIterator, typename GeomTraits, typename TopolTraits>
class TopTraits> void upper_envelope_xy_monotone_3(InputIterator begin, InputIterator end,
void Envelope_diagram_on_surface_2
upper_envelope_xy_monotone_3 (InputIterator begin, InputIterator end, <GeomTraits, TopolTraits>& max_diagram) {
Envelope_diagram_on_surface_2<GeomTraits, using Gt = GeomTraits;
TopTraits>& max_diagram) using Tt = TopolTraits;
{
typedef GeomTraits Traits_3;
typedef typename Envelope_diagram_on_surface_2<
Traits_3, TopTraits>::Arrangement Envelope_diagram_2;
typedef Envelope_divide_and_conquer_3<Traits_3, Envelope_diagram_2>
Envelope_algorithm;
Envelope_algorithm env_alg (max_diagram.geometry_traits(), ENVELOPE_UPPER); using Edos = Envelope_diagram_on_surface_2<Gt, Tt>;
using Ed = typename Edos::Arrangement;
using Envelope_algorithm = Envelope_divide_and_conquer_3<Gt, Ed>;
Envelope_algorithm env_alg(max_diagram.geometry_traits(), ENVELOPE_UPPER);
env_alg.construct_envelope_xy_monotone (begin, end, max_diagram); env_alg.construct_envelope_xy_monotone (begin, end, max_diagram);
return;
} }