From d964ca4e482eb298389819c47fd6dd9ff1cf6d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 22 Dec 2021 12:39:53 +0100 Subject: [PATCH] Naming consistency --- ...ies.h => GarlandHeckbert_plane_policies.h} | 18 +++++++++------- ...ndHeckbert_probabilistic_plane_policies.h} | 21 ++++++++++--------- ...eckbert_probabilistic_triangle_policies.h} | 21 ++++++++++--------- .../GarlandHeckbert_triangle_policies.h | 2 +- 4 files changed, 34 insertions(+), 28 deletions(-) rename Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/{GarlandHeckbert_policies.h => GarlandHeckbert_plane_policies.h} (90%) rename Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/{GarlandHeckbert_probabilistic_policies.h => GarlandHeckbert_probabilistic_plane_policies.h} (92%) rename Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/{GarlandHeckbert_probabilistic_tri_policies.h => GarlandHeckbert_probabilistic_triangle_policies.h} (91%) diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_policies.h similarity index 90% rename from Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h rename to Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_policies.h index 4782502f4ca..cfc19d03aab 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_policies.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_policies.h @@ -10,8 +10,8 @@ // Mael Rouxel-Labbé, // Julian Komaromy -#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H -#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H +#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PLANE_POLICIES_H +#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PLANE_POLICIES_H #include @@ -78,7 +78,7 @@ public: }; template -class GarlandHeckbert_policies +class GarlandHeckbert_plane_policies : public internal::GarlandHeckbert_placement_base< Plane_quadric_calculator, TriangleMesh, GeomTraits>, public internal::GarlandHeckbert_cost_base< @@ -97,7 +97,7 @@ private: typedef internal::GarlandHeckbert_quadrics_storage< Quadric_calculator, TriangleMesh, GeomTraits> Quadrics_storage; - typedef GarlandHeckbert_policies Self; + typedef GarlandHeckbert_plane_policies Self; public: typedef Self Get_cost; @@ -106,8 +106,8 @@ public: typedef typename GeomTraits::FT FT; public: - GarlandHeckbert_policies(TriangleMesh& tmesh, - const FT dm = FT(100)) + GarlandHeckbert_plane_policies(TriangleMesh& tmesh, + const FT dm = FT(100)) : Quadrics_storage(tmesh), Placement_base(), Cost_base(dm) { } @@ -119,7 +119,11 @@ public: using Placement_base::operator(); }; +// backward compatibility +template +using GarlandHeckbert_policies = GarlandHeckbert_plane_policies; + } // namespace Surface_mesh_simplification } // namespace CGAL -#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H +#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PLANE_POLICIES_H diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_policies.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_plane_policies.h similarity index 92% rename from Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_policies.h rename to Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_plane_policies.h index 225c7889e74..56f3b4a7a73 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_policies.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_plane_policies.h @@ -10,8 +10,8 @@ // Mael Rouxel-Labbé, // Julian Komaromy -#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_POLICIES_H -#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_POLICIES_H +#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_PLANE_POLICIES_H +#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_PLANE_POLICIES_H #include @@ -125,7 +125,7 @@ public: template -class GarlandHeckbert_probabilistic_policies +class GarlandHeckbert_probabilistic_plane_policies : public internal::GarlandHeckbert_placement_base< Probabilistic_plane_quadric_calculator, TriangleMesh, GeomTraits>, @@ -148,7 +148,8 @@ private: typedef internal::GarlandHeckbert_quadrics_storage< Quadric_calculator, TriangleMesh, GeomTraits> Quadrics_storage; - typedef GarlandHeckbert_probabilistic_policies Self; + typedef GarlandHeckbert_probabilistic_plane_policies< + TriangleMesh, GeomTraits> Self; public: typedef Self Get_cost; @@ -158,15 +159,15 @@ public: public: // Only available if the quadric calculator is using the default (constant) variance property map - GarlandHeckbert_probabilistic_policies(TriangleMesh& tmesh, - const FT dm = FT(100)) + GarlandHeckbert_probabilistic_plane_policies(TriangleMesh& tmesh, + const FT dm = FT(100)) : Quadrics_storage(tmesh, Quadric_calculator(tmesh)), Placement_base(), Cost_base(dm) { } template - GarlandHeckbert_probabilistic_policies(TriangleMesh& tmesh, - const FT dm, - const FVM fvm) + GarlandHeckbert_probabilistic_plane_policies(TriangleMesh& tmesh, + const FT dm, + const FVM fvm) : Quadrics_storage(tmesh, Quadric_calculator(fvm)), Placement_base(), Cost_base(dm) { } @@ -181,4 +182,4 @@ public: } // namespace Surface_mesh_simplification } // namespace CGAL -#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_POLICIES_H +#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_PLANE_POLICIES_H diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_tri_policies.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_triangle_policies.h similarity index 91% rename from Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_tri_policies.h rename to Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_triangle_policies.h index bcc950b9f19..14bf4f800c1 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_tri_policies.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_triangle_policies.h @@ -9,8 +9,8 @@ // Mael Rouxel-Labbé, // Julian Komaromy -#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRI_POLICIES_H -#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRI_POLICIES_H +#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRIANGLE_POLICIES_H +#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRIANGLE_POLICIES_H #include @@ -114,7 +114,7 @@ public: template -class GarlandHeckbert_probabilistic_tri_policies +class GarlandHeckbert_probabilistic_triangle_policies : public internal::GarlandHeckbert_placement_base< Probabilistic_triangle_quadric_calculator, TriangleMesh, GeomTraits>, @@ -136,7 +136,8 @@ private: typedef internal::GarlandHeckbert_quadrics_storage< Quadric_calculator, TriangleMesh, GeomTraits> Quadrics_storage; - typedef GarlandHeckbert_probabilistic_tri_policies Self; + typedef GarlandHeckbert_probabilistic_triangle_policies< + TriangleMesh, GeomTraits> Self; public: typedef Self Get_cost; @@ -146,15 +147,15 @@ public: public: // Only available if the quadric calculator is using the default (constant) variance property map - GarlandHeckbert_probabilistic_tri_policies(TriangleMesh& tmesh, - const FT dm = FT(100)) + GarlandHeckbert_probabilistic_triangle_policies(TriangleMesh& tmesh, + const FT dm = FT(100)) : Quadrics_storage(tmesh, Quadric_calculator(tmesh)), Placement_base(), Cost_base(dm) { } template - GarlandHeckbert_probabilistic_tri_policies(TriangleMesh& tmesh, - const FT dm, - const FVM fvm) + GarlandHeckbert_probabilistic_triangle_policies(TriangleMesh& tmesh, + const FT dm, + const FVM fvm) : Quadrics_storage(tmesh, Quadric_calculator(fvm)), Placement_base(), Cost_base(dm) { } @@ -169,4 +170,4 @@ public: } // namespace Surface_mesh_simplification } // namespace CGAL -#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRI_POLICIES_H +#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_PROBABILISTIC_TRIANGLE_POLICIES_H diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_triangle_policies.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_triangle_policies.h index b578c63e841..26fe9fdf477 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_triangle_policies.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_triangle_policies.h @@ -107,4 +107,4 @@ public: } // namespace Surface_mesh_simplification } // namespace CGAL -#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_POLICIES_H +#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GARLANDHECKBERT_TRIANGLE_POLICIES_H