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

Renamed P3T3's offset-handling functors (added a _3 suffix)

This commit is contained in:
Mael Rouxel-Labbé 2017-08-22 13:38:31 +02:00
parent 391c737108
commit af86bfca8b
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h
View File

@ -26,7 +26,7 @@
#include <CGAL/license/Periodic_3_triangulation_3.h>
#include <CGAL/internal/Periodic_3_construct_point_3.h>
#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
#include <CGAL/internal/Functor_with_offset_points_adaptor_3.h>
#include <CGAL/Periodic_3_offset_3.h>
#include <CGAL/Periodic_3_triangulation_traits_3.h>
@ -68,23 +68,23 @@ public:
{ }
// Delaunay specific predicates
typedef Functor_with_offset_points_adaptor<Self, typename K::Side_of_oriented_sphere_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Side_of_oriented_sphere_3>
Side_of_oriented_sphere_3;
typedef Functor_with_offset_points_adaptor<Self, typename K::Compare_distance_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Compare_distance_3>
Compare_distance_3;
// Required for Periodic_3_Delaunay_triangulation_remove_traits
typedef Functor_with_offset_points_adaptor<Self, typename K::Coplanar_orientation_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Coplanar_orientation_3>
Coplanar_orientation_3;
typedef Functor_with_offset_points_adaptor<Self, typename K::Coplanar_side_of_bounded_circle_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Coplanar_side_of_bounded_circle_3>
Coplanar_side_of_bounded_circle_3;
// When is_Gabriel is used
typedef Functor_with_offset_points_adaptor<Self, typename K::Side_of_bounded_sphere_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Side_of_bounded_sphere_3>
Side_of_bounded_sphere_3;
// Delaunay specific constructions
typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_circumcenter_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_circumcenter_3>
Construct_circumcenter_3;
using Base::construct_point_3_object;

14
Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h
View File

@ -25,7 +25,7 @@
#include <CGAL/license/Periodic_3_triangulation_3.h>
#include <CGAL/internal/Functor_with_offset_weighted_points_adaptor.h>
#include <CGAL/internal/Functor_with_offset_weighted_points_adaptor_3.h>
#include <CGAL/internal/Periodic_3_construct_weighted_point_3.h>
#include <CGAL/Periodic_3_offset_3.h>
#include <CGAL/Periodic_3_triangulation_traits_3.h>
@ -68,23 +68,23 @@ public:
typedef Periodic_3_construct_weighted_point_3<Self, typename K::Construct_weighted_point_3>
Construct_weighted_point_3;
typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Power_side_of_oriented_power_sphere_3>
typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Power_side_of_oriented_power_sphere_3>
Power_side_of_oriented_power_sphere_3;
typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Compare_weighted_squared_radius_3>
typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Compare_weighted_squared_radius_3>
Compare_weighted_squared_radius_3;
typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Compare_power_distance_3>
typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Compare_power_distance_3>
Compare_power_distance_3;
// Undocumented, requried for Is_Gabriel (Alpha shapes)
typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Power_side_of_bounded_power_sphere_3>
typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Power_side_of_bounded_power_sphere_3>
Power_side_of_bounded_power_sphere_3;
// Required for Periodic_3_regular_remove_traits
typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Coplanar_orientation_3>
typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Coplanar_orientation_3>
Coplanar_orientation_3;
// When dual operations are used
typedef Functor_with_offset_weighted_points_adaptor<Self, typename K::Construct_weighted_circumcenter_3>
typedef Functor_with_offset_weighted_points_adaptor_3<Self, typename K::Construct_weighted_circumcenter_3>
Construct_weighted_circumcenter_3;
// Operations

13
Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h
View File

@ -14,6 +14,7 @@
//
// Author(s) : Nico Kruithof <Nico.Kruithof@sophia.inria.fr>
// Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
// Mael Rouxel-Labbé
#ifndef CGAL_PERIODIC_3_TRIANGULATION_TRAITS_3_H
#define CGAL_PERIODIC_3_TRIANGULATION_TRAITS_3_H
@ -21,7 +22,7 @@
#include <CGAL/license/Periodic_3_triangulation_3.h>
#include <CGAL/internal/Periodic_3_construct_point_3.h>
#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
#include <CGAL/internal/Functor_with_offset_points_adaptor_3.h>
#include <CGAL/Periodic_3_offset_3.h>
#include <CGAL/basic.h>
@ -83,17 +84,17 @@ public:
Construct_point_3;
// Triangulation predicates
typedef Functor_with_offset_points_adaptor<Self, typename K::Compare_xyz_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Compare_xyz_3>
Compare_xyz_3;
typedef Functor_with_offset_points_adaptor<Self, typename K::Orientation_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Orientation_3>
Orientation_3;
// Triangulation constructions
typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_segment_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_segment_3>
Construct_segment_3;
typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_triangle_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_triangle_3>
Construct_triangle_3;
typedef Functor_with_offset_points_adaptor<Self, typename K::Construct_tetrahedron_3>
typedef Functor_with_offset_points_adaptor_3<Self, typename K::Construct_tetrahedron_3>
Construct_tetrahedron_3;
// Operations

12
Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor.h → Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_points_adaptor_3.h
View File

@ -19,15 +19,15 @@
// Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
// Aymeric Pellé <Aymeric.Pelle@sophia.inria.fr>
// Mael Rouxel-Labbé
#ifndef CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_H
#define CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_H
#ifndef CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_3_H
#define CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_3_H
#include <CGAL/license/Periodic_3_triangulation_3.h>
namespace CGAL {
template < class K_, class Functor_ >
class Functor_with_offset_points_adaptor
class Functor_with_offset_points_adaptor_3
: public Functor_
{
typedef K_ Kernel;
@ -41,8 +41,8 @@ class Functor_with_offset_points_adaptor
public:
typedef typename Functor::result_type result_type;
Functor_with_offset_points_adaptor(const Functor& functor,
const Construct_point_3& cp)
Functor_with_offset_points_adaptor_3(const Functor& functor,
const Construct_point_3& cp)
: Functor_(functor), cp(cp)
{ }
@ -75,4 +75,4 @@ public:
} // namespace CGAL
#endif /* CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_H */
#endif /* CGAL_FUNCTOR_WITH_OFFSET_POINTS_ADAPTOR_3_H */

20
Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor.h → Periodic_3_triangulation_3/include/CGAL/internal/Functor_with_offset_weighted_points_adaptor_3.h
View File

@ -23,20 +23,20 @@
// Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
// Aymeric Pellé <Aymeric.Pelle@sophia.inria.fr>
// Mael Rouxel-Labbé
#ifndef CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_H
#define CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_H
#ifndef CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_3_H
#define CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_3_H
#include <CGAL/license/Periodic_3_triangulation_3.h>
#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
#include <CGAL/internal/Functor_with_offset_points_adaptor_3.h>
namespace CGAL {
template < class K_, class Functor_ >
class Functor_with_offset_weighted_points_adaptor
: public Functor_with_offset_points_adaptor<K_, Functor_>
class Functor_with_offset_weighted_points_adaptor_3
: public Functor_with_offset_points_adaptor_3<K_, Functor_>
{
typedef Functor_with_offset_points_adaptor<K_, Functor_> Base;
typedef Functor_with_offset_points_adaptor_3<K_, Functor_> Base;
typedef K_ Kernel;
typedef Functor_ Functor;
@ -52,9 +52,9 @@ class Functor_with_offset_weighted_points_adaptor
public:
typedef typename Functor::result_type result_type;
Functor_with_offset_weighted_points_adaptor(const Functor_& functor,
const Construct_point_3& cp,
const Construct_weighted_point_3& wp)
Functor_with_offset_weighted_points_adaptor_3(const Functor_& functor,
const Construct_point_3& cp,
const Construct_weighted_point_3& wp)
: Base(functor, cp), wp(wp)
{ }
@ -139,4 +139,4 @@ public:
} // namespace CGAL
#endif /* CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_H */
#endif /* CGAL_FUNCTOR_WITH_OFFSET_WEIGHTED_POINTS_ADAPTOR_3_H */