From 0261184deeddaa27ec68e9bd3568027b8ec7c4f0 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 28 Nov 2024 14:31:01 +0000 Subject: [PATCH] WIP --- Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h | 7 +++++-- .../include/CGAL/Periodic_3_regular_triangulation_3.h | 4 ++-- .../Periodic_3_triangulation_filtered_traits_3.h | 9 ++++++++- .../Robust_periodic_weighted_circumcenter_traits_3.h | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h b/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h index 16dcf6818be..bf5add8041d 100644 --- a/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h +++ b/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h @@ -34,7 +34,7 @@ minimum_dihedral_angle( const typename K::Point_3& p1, const typename K::Point_3& p2, const typename K::Point_3& p3, - K k = K()) + const K& k = K()) { typedef typename K::FT FT; @@ -84,7 +84,7 @@ minimum_dihedral_angle( const typename K::Point_3& p1, const typename K::Point_3& p2, const typename K::Point_3& p3, - K k = K()) + const K& k) { typedef typename K::FT FT; @@ -148,6 +148,7 @@ template typename Kernel_traits::Kernel::FT minimum_dihedral_angle(const Tetrahedron_3& t ) { + std::cout << "A" << std::endl; return minimum_dihedral_angle(t, typename Kernel_traits::Kernel() ); } @@ -155,6 +156,8 @@ template typename C3T3::Triangulation::Geom_traits::FT minimum_dihedral_angle_in_c3t3(const C3T3& c3t3) { + + std::cout << "B" << std::endl; typedef typename C3T3::Triangulation::Geom_traits K; typename K::FT min_angle = (typename K::FT)(90.); diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h index 4dba83f3847..e950cd7e4cf 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h @@ -544,7 +544,7 @@ public: typedef CGAL::Periodic_3_regular_triangulation_remove_traits_3< Gt > P3removeT; typedef CGAL::Regular_triangulation_3< P3removeT > Euclidean_triangulation; typedef Vertex_remover< Euclidean_triangulation > Remover; - P3removeT remove_traits(domain()); + P3removeT remove_traits(geom_traits()); Euclidean_triangulation tmp(remove_traits); Remover remover(this, tmp); Conflict_tester ct(this); @@ -576,7 +576,7 @@ public: typedef CGAL::Regular_triangulation_3< P3removeT > Euclidean_triangulation; typedef Vertex_remover< Euclidean_triangulation > Remover; - P3removeT remove_traits(domain()); + P3removeT remove_traits(geom_traits()); Euclidean_triangulation tmp(remove_traits); Remover remover(this, tmp); Cover_manager cover_manager(*this); diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_filtered_traits_3.h index 0254bf652b9..dce0ddf2d9c 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_filtered_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_filtered_traits_3.h @@ -81,7 +81,7 @@ public: typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3; virtual ~Periodic_3_triangulation_filtered_traits_base_3() { } - + Periodic_3_triangulation_filtered_traits_base_3(const& Periodic_3_triangulation_filtered_traits_base_3) = delete; Periodic_3_triangulation_filtered_traits_base_3(const Iso_cuboid_3& domain, const Kernel& k) : @@ -165,6 +165,8 @@ public: typedef K_ Kernel; typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3; + Periodic_3_triangulation_filtered_traits_3& operator=(const Periodic_3_triangulation_filtered_traits_3&) = delete; + Periodic_3_triangulation_filtered_traits_3(const& Periodic_3_triangulation_filtered_traits_3) = delete; Periodic_3_triangulation_filtered_traits_3(const Iso_cuboid_3& domain, const Kernel& k) : Base(domain, k) @@ -181,6 +183,11 @@ public: typedef K_ Kernel; typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3; + Periodic_3_triangulation_filtered_traits_3& operator=(const Periodic_3_triangulation_filtered_traits_3& other) + { static_cast(*this) = other; + std::cout << "here" << std::endl; + return *this; } + Periodic_3_triangulation_filtered_traits_3(const& Periodic_3_triangulation_filtered_traits_3) = delete; Periodic_3_triangulation_filtered_traits_3(const Iso_cuboid_3& domain, const Kernel& k) : Base(domain, k) diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Robust_periodic_weighted_circumcenter_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Robust_periodic_weighted_circumcenter_traits_3.h index 8874ab5e419..f1ef12f5517 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Robust_periodic_weighted_circumcenter_traits_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Robust_periodic_weighted_circumcenter_traits_3.h @@ -279,7 +279,7 @@ public: { return Construct_weighted_circumcenter_3(static_cast(*this)); } Robust_periodic_weighted_circumcenter_traits_3(const Iso_cuboid_3& domain = Iso_cuboid_3(0,0,0,1,1,1), - const Base_traits& t = Base_traits()) + const Base_traits& t = Base_traits() ) // AF : Base_traits(domain, t) { } };