mirror of https://github.com/CGAL/cgal
Remove files that were deprecated in 4.9
This commit is contained in:
Andreas Fabri
parent
100d4f34ef
commit
899364b87b
|
|
@ -1,25 +0,0 @@
|
|||
|
||||
namespace CGAL {
|
||||
|
||||
/*!
|
||||
\ingroup PkgTriangulation2TraitsClasses
|
||||
|
||||
\deprecated The class is deprecated since \cgal 4.10, as the weighted point and the function
|
||||
objects for weighted points are part of the concept `Kernel`. The class is kept for backward
|
||||
compatibility, but ignores the template parameter `Weight`.
|
||||
|
||||
\tparam K must be a model of the `Kernel` concept.
|
||||
|
||||
\tparam Weight This template parameter is ignored, as `Kernel::Weighted_point_2`
|
||||
uses the type `Kernel::FT`.
|
||||
|
||||
\cgalModels `RegularTriangulationTraits_2`
|
||||
|
||||
*/
|
||||
template< typename K, typename Weight >
|
||||
class Regular_triangulation_euclidean_traits_2 : public K {
|
||||
public:
|
||||
|
||||
}; /* end Regular_triangulation_euclidean_traits_2 */
|
||||
|
||||
} /* end namespace CGAL */
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
|
||||
namespace CGAL {
|
||||
|
||||
/*!
|
||||
\ingroup PkgTriangulation2TraitsClasses
|
||||
|
||||
\deprecated This class is deprecated, as the predicates and constructions that operate
|
||||
on weighted points are now define in the concept `Kernel`, and are dealt with by filtered kernels.
|
||||
|
||||
*/
|
||||
template< typename FK >
|
||||
class Regular_triangulation_filtered_traits_2 {
|
||||
public:
|
||||
|
||||
/// @}
|
||||
|
||||
}; /* end Regular_triangulation_filtered_traits_2 */
|
||||
} /* end namespace CGAL */
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
|
||||
namespace CGAL {
|
||||
|
||||
/*!
|
||||
\ingroup PkgTriangulation2TraitsClasses
|
||||
|
||||
\deprecated This class is deprecated since \cgal 4.9. Instead of using it, pass directly the kernel.
|
||||
|
||||
|
||||
The class `Triangulation_euclidean_traits_2` can be used to instantiate the geometric traits
|
||||
class of basic and Delaunay triangulations.
|
||||
The template parameter `K` has to
|
||||
be instantiated by a model of the `Kernel` concept.
|
||||
The class `Triangulation_euclidean_traits_2` uses types
|
||||
and predicates defined in `K`.
|
||||
|
||||
\cgalModels `TriangulationTraits_2`
|
||||
\cgalModels `DelaunayTriangulationTraits_2`
|
||||
|
||||
\sa `TriangulationTraits_2`
|
||||
\sa `DelaunayTriangulationTraits_2`
|
||||
\sa `CGAL::Triangulation_2<Traits,Tds>`
|
||||
\sa `CGAL::Delaunay_triangulation_2<Traits,Tds>`
|
||||
\sa `CGAL::Projection_traits_xy_3<K>`
|
||||
\sa `CGAL::Projection_traits_xz_3<K>`
|
||||
\sa `CGAL::Projection_traits_yz_3<K>`
|
||||
|
||||
*/
|
||||
template< typename K >
|
||||
class Triangulation_euclidean_traits_2 {
|
||||
public:
|
||||
|
||||
/// @}
|
||||
|
||||
}; /* end Triangulation_euclidean_traits_2 */
|
||||
} /* end namespace CGAL */
|
||||
|
|
@ -6,9 +6,6 @@
|
|||
/// \ingroup PkgTriangulation2Ref
|
||||
|
||||
|
||||
/// \defgroup PkgTriangulation2TraitsClasses Traits Classes
|
||||
/// \ingroup PkgTriangulation2Ref
|
||||
|
||||
/// \defgroup PkgTriangulation2VertexFaceClasses Vertex and Face Classes
|
||||
/// \ingroup PkgTriangulation2Ref
|
||||
|
||||
|
|
@ -95,9 +92,6 @@ are described in Chapter \ref PkgTDS2Ref "2D Triangulation Data Structure".
|
|||
- `CGAL::Constrained_triangulation_plus_2<Tr>`
|
||||
- `CGAL::Triangulation_hierarchy_2<Tr>`
|
||||
|
||||
- `CGAL::Regular_triangulation_euclidean_traits_2<K,Weight>`
|
||||
- `CGAL::Regular_triangulation_filtered_traits_2<FK>`
|
||||
|
||||
- `CGAL::Triangulation_face_base_2<Traits,Fb>`
|
||||
- `CGAL::Triangulation_vertex_base_2<Traits,Vb>`
|
||||
- `CGAL::Regular_triangulation_face_base_2<Traits,Fb>`
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
// Copyright (c) 1997 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
//
|
||||
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
// SPDX-License-Identifier: GPL-3.0+
|
||||
//
|
||||
// Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr>
|
||||
// Sylvain Pion
|
||||
|
||||
#ifndef CGAL_REGULAR_TRIANGULATION_EUCLIDEAN_TRAITS_2_H
|
||||
#define CGAL_REGULAR_TRIANGULATION_EUCLIDEAN_TRAITS_2_H
|
||||
|
||||
#include <CGAL/license/Triangulation_2.h>
|
||||
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/Regular_triangulation_euclidean_traits_2.h>"
|
||||
#define CGAL_DEPRECATED_MESSAGE_DETAILS \
|
||||
"The kernel K can be used directly as traits since weighted points and "\
|
||||
"the associated function objects are now part of the concept Kernel."
|
||||
#include <CGAL/internal/deprecation_warning.h>
|
||||
|
||||
namespace CGAL {
|
||||
|
||||
template < class K, class W = typename K::RT>
|
||||
class Regular_triangulation_euclidean_traits_2
|
||||
: public K
|
||||
{
|
||||
public:
|
||||
Regular_triangulation_euclidean_traits_2() {}
|
||||
Regular_triangulation_euclidean_traits_2(const K& k) : K(k) {}
|
||||
};
|
||||
|
||||
} //namespace CGAL
|
||||
|
||||
#endif // CGAL_REGULAR_TRIANGULATION_EUCLIDEAN_TRAITS_2_H
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
// Copyright (c) 2004 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
//
|
||||
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
// SPDX-License-Identifier: GPL-3.0+
|
||||
//
|
||||
//
|
||||
// Author(s) : Sylvain Pion
|
||||
|
||||
// kept for backward compatibility
|
||||
|
|
@ -1,140 +0,0 @@
|
|||
// Copyright (c) 1997 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
//
|
||||
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
// SPDX-License-Identifier: GPL-3.0+
|
||||
//
|
||||
//
|
||||
// Author(s) : Mariette Yvinec
|
||||
|
||||
#ifndef CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_2_H
|
||||
#define CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_2_H
|
||||
|
||||
#include <CGAL/license/Triangulation_2.h>
|
||||
|
||||
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/Triangulation_euclidean_traits_2.h>"
|
||||
#include <CGAL/internal/deprecation_warning.h>
|
||||
|
||||
#include <CGAL/Point_2.h>
|
||||
#include <CGAL/Segment_2.h>
|
||||
#include <CGAL/Triangle_2.h>
|
||||
#include <CGAL/Line_2.h>
|
||||
#include <CGAL/Ray_2.h>
|
||||
#include <CGAL/predicates_on_points_2.h>
|
||||
#include <CGAL/basic_constructions_2.h>
|
||||
#include <CGAL/distance_predicates_2.h>
|
||||
|
||||
#include <CGAL/triangulation_assertions.h>
|
||||
#include <CGAL/Intersections_2/Segment_2_Segment_2.h>
|
||||
|
||||
namespace CGAL {
|
||||
|
||||
template < class R >
|
||||
class Triangulation_euclidean_traits_2 {
|
||||
public:
|
||||
typedef R Rep;
|
||||
typedef typename R::Point_2 Point_2;
|
||||
typedef typename R::Segment_2 Segment_2;
|
||||
typedef typename R::Triangle_2 Triangle_2;
|
||||
typedef typename R::Line_2 Line_2;
|
||||
typedef typename R::Ray_2 Ray_2;
|
||||
|
||||
typedef typename R::Less_x_2 Less_x_2;
|
||||
typedef typename R::Less_y_2 Less_y_2;
|
||||
typedef typename R::Compare_x_2 Compare_x_2;
|
||||
typedef typename R::Compare_y_2 Compare_y_2;
|
||||
typedef typename R::Orientation_2 Orientation_2;
|
||||
typedef typename R::Side_of_oriented_circle_2 Side_of_oriented_circle_2;
|
||||
typedef typename R::Construct_circumcenter_2 Construct_circumcenter_2;
|
||||
typedef typename R::Construct_bisector_2 Construct_bisector_2;
|
||||
typedef typename R::Compare_distance_2 Compare_distance_2;
|
||||
typedef typename R::Construct_segment_2 Construct_segment_2;
|
||||
typedef typename R::Construct_triangle_2 Construct_triangle_2;
|
||||
typedef typename R::Construct_direction_2 Construct_direction_2;
|
||||
typedef typename R::Construct_ray_2 Construct_ray_2;
|
||||
|
||||
//for natural_neighbor_coordinates_2
|
||||
typedef typename R::FT FT;
|
||||
typedef typename R::Equal_x_2 Equal_x_2;
|
||||
typedef typename R::Compute_area_2 Compute_area_2;
|
||||
Compute_area_2 compute_area_2_object () const {return Compute_area_2();}
|
||||
|
||||
// for compatibility with previous versions
|
||||
typedef Point_2 Point;
|
||||
typedef Segment_2 Segment;
|
||||
typedef Triangle_2 Triangle;
|
||||
typedef Ray_2 Ray;
|
||||
typedef Line_2 Line;
|
||||
|
||||
Triangulation_euclidean_traits_2() {}
|
||||
Triangulation_euclidean_traits_2(const Triangulation_euclidean_traits_2 &) {}
|
||||
Triangulation_euclidean_traits_2 &operator=
|
||||
(const Triangulation_euclidean_traits_2 &)
|
||||
{return *this;}
|
||||
|
||||
Less_x_2
|
||||
less_x_2_object() const
|
||||
{ return Less_x_2();}
|
||||
|
||||
Less_y_2
|
||||
less_y_2_object() const
|
||||
{ return Less_y_2();}
|
||||
|
||||
Compare_x_2
|
||||
compare_x_2_object() const
|
||||
{ return Compare_x_2();}
|
||||
|
||||
Compare_y_2
|
||||
compare_y_2_object() const
|
||||
{ return Compare_y_2();}
|
||||
|
||||
Orientation_2
|
||||
orientation_2_object() const
|
||||
{ return Orientation_2();}
|
||||
|
||||
Side_of_oriented_circle_2
|
||||
side_of_oriented_circle_2_object() const
|
||||
{return Side_of_oriented_circle_2();}
|
||||
|
||||
Construct_circumcenter_2
|
||||
construct_circumcenter_2_object() const
|
||||
{ return Construct_circumcenter_2();}
|
||||
|
||||
Construct_bisector_2
|
||||
construct_bisector_2_object() const
|
||||
{return Construct_bisector_2();}
|
||||
|
||||
Compare_distance_2
|
||||
compare_distance_2_object() const
|
||||
{return Compare_distance_2();}
|
||||
|
||||
Construct_segment_2 construct_segment_2_object() const
|
||||
{return Construct_segment_2();}
|
||||
|
||||
Construct_triangle_2 construct_triangle_2_object() const
|
||||
{return Construct_triangle_2();}
|
||||
|
||||
Construct_direction_2 construct_direction_2_object() const
|
||||
{return Construct_direction_2();}
|
||||
|
||||
Construct_ray_2 construct_ray_2_object() const
|
||||
{return Construct_ray_2();}
|
||||
|
||||
};
|
||||
|
||||
} //namespace CGAL
|
||||
|
||||
#endif // CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_2_H
|
||||
|
|
@ -1,6 +1,3 @@
|
|||
// This file tests the deprecated headers
|
||||
// Triangulation_euclidean_traits_.._3 on purpose.
|
||||
|
||||
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
|
||||
#include <CGAL/Projection_traits_xy_3.h>
|
||||
#include <CGAL/Projection_traits_yz_3.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue