From 0261184deeddaa27ec68e9bd3568027b8ec7c4f0 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 28 Nov 2024 14:31:01 +0000 Subject: [PATCH 01/10] 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 16dcf6818be8..bf5add8041d6 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 4dba83f38470..e950cd7e4cfd 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 @@ class Periodic_3_regular_triangulation_3 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 @@ class Periodic_3_regular_triangulation_3 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 0254bf652b95..dce0ddf2d9c6 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 @@ class Periodic_3_triangulation_filtered_traits_base_3 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 @@ class Periodic_3_triangulation_filtered_traits_3 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 @@ class Periodic_3_triangulation_filtered_traits_3 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 8874ab5e4193..f1ef12f5517b 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 @@ class Robust_periodic_weighted_circumcenter_traits_3 { 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) { } }; From 2a41e1dc99a1a627db47f7eeea666ecedfe6a492 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 3 Dec 2024 07:16:34 +0000 Subject: [PATCH 02/10] change parameters for shorter debug cycle. To undo befoe merging --- .../test_triply_periodic_minimal_surfaces.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp index cab19a02eda1..a9595879a136 100644 --- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp +++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp @@ -237,10 +237,10 @@ C3t3 make_mesh(const Labeling_function& labeling_function, const Iso_cuboid& can Periodic_mesh_domain domain(labeling_function, canonical_cube); Periodic_mesh_criteria criteria(facet_angle = 30., - facet_size = 0.03 * 2 /*domain's edge length*/, - facet_distance = 0.03 * 2 /*domain's edge length*/, + facet_size = 0.1 * 2 /*domain's edge length*/, + facet_distance = 0.1 * 2 /*domain's edge length*/, cell_radius_edge_ratio = 2., - cell_size = 0.05); + cell_size = 0.5); return CGAL::make_periodic_3_mesh_3(domain, criteria); } From fc0f1977f697a5fef479ae1898973b95f14fc912 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 3 Dec 2024 08:27:37 +0000 Subject: [PATCH 03/10] Add a const& --- Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h | 5 +---- .../test_triply_periodic_minimal_surfaces.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 8 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 bf5add8041d6..6ec519975b1b 100644 --- a/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h +++ b/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h @@ -139,7 +139,7 @@ minimum_dihedral_angle( template typename K::FT -minimum_dihedral_angle(const typename K::Tetrahedron_3& t, K k = K() ) +minimum_dihedral_angle(const typename K::Tetrahedron_3& t , const K& k = K()) { return minimum_dihedral_angle(t[0],t[1],t[2],t[3],k); } @@ -148,7 +148,6 @@ 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() ); } @@ -156,8 +155,6 @@ 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_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp index a9595879a136..d5c7c94623b0 100644 --- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp +++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp @@ -237,10 +237,10 @@ C3t3 make_mesh(const Labeling_function& labeling_function, const Iso_cuboid& can Periodic_mesh_domain domain(labeling_function, canonical_cube); Periodic_mesh_criteria criteria(facet_angle = 30., - facet_size = 0.1 * 2 /*domain's edge length*/, - facet_distance = 0.1 * 2 /*domain's edge length*/, + facet_size = 0.03 * 2 /*domain's edge length*/, + facet_distance = 0.03 * 2 /*domain's edge length*/, cell_radius_edge_ratio = 2., - cell_size = 0.5); + cell_size = 0.05); return CGAL::make_periodic_3_mesh_3(domain, criteria); } @@ -252,7 +252,7 @@ int main(int, char**) Iso_cuboid canonical_cube(1, 1, 1, 3, 3, 3); std::map functions; -#ifdef CGAL_NDEBUG +#if 0 // def CGAL_NDEBUG // Only test those when not in debug (otherwise it takes too long) functions["D_prime"] = Periodic_function(D_prime, canonical_cube); functions["G_prime"] = Periodic_function(G_prime, canonical_cube); From f2815f3316c133f411a6ff8737a09e21fd6c1d67 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 3 Dec 2024 08:28:25 +0000 Subject: [PATCH 04/10] Add a const& --- .../Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp index d5c7c94623b0..cab19a02eda1 100644 --- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp +++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp @@ -252,7 +252,7 @@ int main(int, char**) Iso_cuboid canonical_cube(1, 1, 1, 3, 3, 3); std::map functions; -#if 0 // def CGAL_NDEBUG +#ifdef CGAL_NDEBUG // Only test those when not in debug (otherwise it takes too long) functions["D_prime"] = Periodic_function(D_prime, canonical_cube); functions["G_prime"] = Periodic_function(G_prime, canonical_cube); From ac6bebdb1a923554c5f5abd0ee4dfda59a6ae6d1 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 3 Dec 2024 09:22:58 +0000 Subject: [PATCH 05/10] cleanup --- .../Periodic_3_triangulation_filtered_traits_3.h | 10 +++++----- .../Robust_periodic_weighted_circumcenter_traits_3.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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 dce0ddf2d9c6..88f71afc379b 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,9 @@ class Periodic_3_triangulation_filtered_traits_base_3 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) : @@ -166,7 +168,9 @@ class Periodic_3_triangulation_filtered_traits_3 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) @@ -183,11 +187,7 @@ class Periodic_3_triangulation_filtered_traits_3 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 f1ef12f5517b..5fad52049f21 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 @@ class Robust_periodic_weighted_circumcenter_traits_3 { 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() ) // AF + const Base_traits& t = Base_traits() ) : Base_traits(domain, t) { } }; From 4ae398296948aab5524531a483f099dbf8368b4b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 3 Dec 2024 09:28:26 +0000 Subject: [PATCH 06/10] cleanup --- .../internal/Robust_periodic_weighted_circumcenter_traits_3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5fad52049f21..8874ab5e4193 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 @@ class Robust_periodic_weighted_circumcenter_traits_3 { 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()) : Base_traits(domain, t) { } }; From 81e1bf2a5a9b5f5fdbb2d771ae9229a1587b3c6d Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 3 Dec 2024 10:00:57 +0000 Subject: [PATCH 07/10] typedef Self --- .../internal/Periodic_3_triangulation_filtered_traits_3.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 88f71afc379b..7867ea9597bd 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 @@ -162,14 +162,15 @@ class Periodic_3_triangulation_filtered_traits_3 : public Periodic_3_triangulation_filtered_traits_base_3 { typedef Periodic_3_triangulation_filtered_traits_base_3 Base; + typedef Periodic_3_triangulation_filtered_traits_3 Self; 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& operator=(const Self&) = delete; - Periodic_3_triangulation_filtered_traits_3(const& Periodic_3_triangulation_filtered_traits_3) = delete; + Periodic_3_triangulation_filtered_traits_3(const& Self) = delete; Periodic_3_triangulation_filtered_traits_3(const Iso_cuboid_3& domain, const Kernel& k) From 24046e1974cd0006eeb51ef28dbd12afa9d26958 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 3 Dec 2024 11:01:35 +0000 Subject: [PATCH 08/10] Remove lines with = delete; --- .../internal/Periodic_3_triangulation_filtered_traits_3.h | 8 -------- 1 file changed, 8 deletions(-) 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 7867ea9597bd..0254bf652b95 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 @@ -82,8 +82,6 @@ class Periodic_3_triangulation_filtered_traits_base_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) : @@ -162,16 +160,11 @@ class Periodic_3_triangulation_filtered_traits_3 : public Periodic_3_triangulation_filtered_traits_base_3 { typedef Periodic_3_triangulation_filtered_traits_base_3 Base; - typedef Periodic_3_triangulation_filtered_traits_3 Self; public: typedef K_ Kernel; typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3; - Periodic_3_triangulation_filtered_traits_3& operator=(const Self&) = delete; - - Periodic_3_triangulation_filtered_traits_3(const& Self) = delete; - Periodic_3_triangulation_filtered_traits_3(const Iso_cuboid_3& domain, const Kernel& k) : Base(domain, k) @@ -188,7 +181,6 @@ class Periodic_3_triangulation_filtered_traits_3 typedef K_ Kernel; typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3; - Periodic_3_triangulation_filtered_traits_3(const Iso_cuboid_3& domain, const Kernel& k) : Base(domain, k) From cc878e35e673f87f72230ff9507d9abc62ae0719 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 6 Dec 2024 13:09:14 +0000 Subject: [PATCH 09/10] Change the criteria if in Debug mode --- .../test_triply_periodic_minimal_surfaces.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp index cab19a02eda1..864dc9376edc 100644 --- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp +++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/test_triply_periodic_minimal_surfaces.cpp @@ -236,11 +236,19 @@ C3t3 make_mesh(const Labeling_function& labeling_function, const Iso_cuboid& can { Periodic_mesh_domain domain(labeling_function, canonical_cube); +#ifdef CGAL_NDEBUG Periodic_mesh_criteria criteria(facet_angle = 30., facet_size = 0.03 * 2 /*domain's edge length*/, facet_distance = 0.03 * 2 /*domain's edge length*/, cell_radius_edge_ratio = 2., cell_size = 0.05); +#else + Periodic_mesh_criteria criteria(facet_angle = 30., + facet_size = 0.1 * 2 /*domain's edge length*/, + facet_distance = 0.1 * 2 /*domain's edge length*/, + cell_radius_edge_ratio = 2., + cell_size = 0.1); +#endif return CGAL::make_periodic_3_mesh_3(domain, criteria); } @@ -313,7 +321,6 @@ int main(int, char**) std::cout << std::endl; } } - std::cout << "EXIT SUCCESS" << std::endl; return 0; } From e9775789e547d3bc4b8028fabed7e318c14c34b7 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 6 Dec 2024 14:49:33 +0100 Subject: [PATCH 10/10] Apply suggestions from code review Co-authored-by: Mael --- Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h | 4 ++-- 1 file changed, 2 insertions(+), 2 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 6ec519975b1b..7678bc3eaf8a 100644 --- a/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h +++ b/Mesh_3/include/CGAL/Mesh_3/min_dihedral_angle.h @@ -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, - const K& k) + const K& k = K()) { typedef typename K::FT FT; @@ -139,7 +139,7 @@ minimum_dihedral_angle( template typename K::FT -minimum_dihedral_angle(const typename K::Tetrahedron_3& t , const K& k = K()) +minimum_dihedral_angle(const typename K::Tetrahedron_3& t , const K& k = K()) { return minimum_dihedral_angle(t[0],t[1],t[2],t[3],k); }