From 84d0f6b9a610f08f6a2ff6760a6a03ecd8eeab5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 19 Nov 2024 17:46:22 +0100 Subject: [PATCH 1/5] use default_random --- .../Tetrahedral_remeshing/test_tetrahedral_remeshing_io.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_io.cpp b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_io.cpp index fa3220b0635..212d72f7112 100644 --- a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_io.cpp +++ b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_io.cpp @@ -21,9 +21,10 @@ typedef Remeshing_triangulation::Cell_handle Cell_handle; int main(int argc, char* argv[]) { + const unsigned int nbv = (argc > 1) ? atoi(argv[1]) : 100; - CGAL::Random rng; + CGAL::Random rng = CGAL::get_default_random(); std::cout << "CGAL Random seed = " << CGAL::get_default_random().get_seed() << std::endl; std::vector points; From 400e4a9d421192a6aa2771727c64c7873b697bff Mon Sep 17 00:00:00 2001 From: POUGET Marc Date: Mon, 2 Dec 2024 13:57:09 +0100 Subject: [PATCH 2/5] fixed mandatory code in CGAL_assert --- .../CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h index da42c7429f9..04be8869a3b 100644 --- a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h +++ b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h @@ -78,12 +78,14 @@ namespace internal { intersection(*c_pq, *c_qr, std::back_inserter(inters)); CGAL_assertion(assign(pair, inters[0])); + assign(pair, inters[0]); if(pair.second == 1) { if(_gt.has_on_bounded_side_2_object()(l_inf, pair.first)) return pair.first; CGAL_assertion(assign(pair, inters[1])); + assign(pair, inters[1]); return pair.first; } return pair.first; @@ -105,12 +107,14 @@ namespace internal { intersection(*l, *c, std::back_inserter(inters)); CGAL_assertion(assign(pair,inters[0])); + assign(pair,inters[0]); if(pair.second == 1) { if(_gt.has_on_bounded_side_2_object()(l_inf, pair.first)) return pair.first; CGAL_assertion(assign(pair, inters[1])); + assign(pair, inters[1]); return pair.first; } return pair.first; @@ -241,11 +245,13 @@ namespace internal { std::pair pair; CGAL_assertion(assign(pair,inters[0])); + assign(pair,inters[0]); CGAL_assertion(pair.second == 1); if(_gt.less_y_2_object()(p, q)) return Line_arc_2(bis_pq,a,pair.first); CGAL_assertion(assign(pair,inters[1])); + assign(pair,inters[1]); CGAL_assertion(pair.second == 1); return Line_arc_2(bis_pq,a,pair.first); } @@ -262,6 +268,7 @@ namespace internal { std::pair pair; CGAL_assertion(assign(pair,inters[0])); + assign(pair,inters[0]); CGAL_assertion(pair.second == 1); Hyperbolic_point_2 approx_pinf(to_double(pair.first.x()), to_double(pair.first.y())); @@ -276,6 +283,7 @@ namespace internal { } CGAL_assertion(assign(pair,inters[1])); + assign(pair,inters[1]); if(_gt.orientation_2_object()(approx_c,approx_a,approx_pinf) == POSITIVE) return Circular_arc_2(*c_pq, pair.first, a); From 469434d8a67f2361cf35a27ecd61d929eedc5998 Mon Sep 17 00:00:00 2001 From: POUGET Marc Date: Mon, 2 Dec 2024 14:21:19 +0100 Subject: [PATCH 3/5] applied Seb suggestion --- ...bolic_Delaunay_triangulation_CK_traits_2.h | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h index 04be8869a3b..ea57ad56e8b 100644 --- a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h +++ b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h @@ -77,16 +77,18 @@ namespace internal { std::vector< Intersection_result > inters; intersection(*c_pq, *c_qr, std::back_inserter(inters)); - CGAL_assertion(assign(pair, inters[0])); - assign(pair, inters[0]); - if(pair.second == 1) + CGAL_assertion_code(bool ok=) + assign(pair, inters[0]); + CGAL_assertion(ok); + if(pair.second == 1) { if(_gt.has_on_bounded_side_2_object()(l_inf, pair.first)) return pair.first; - CGAL_assertion(assign(pair, inters[1])); - assign(pair, inters[1]); - return pair.first; + CGAL_assertion_code(bool ok=) + assign(pair, inters[1]); + CGAL_assertion(ok); + return pair.first; } return pair.first; } @@ -106,16 +108,18 @@ namespace internal { std::vector< Intersection_result > inters; intersection(*l, *c, std::back_inserter(inters)); - CGAL_assertion(assign(pair,inters[0])); - assign(pair,inters[0]); + CGAL_assertion_code(bool ok=) + assign(pair,inters[0]); + CGAL_assertion(ok); if(pair.second == 1) { if(_gt.has_on_bounded_side_2_object()(l_inf, pair.first)) return pair.first; - CGAL_assertion(assign(pair, inters[1])); - assign(pair, inters[1]); - return pair.first; + CGAL_assertion_code(bool ok=) + assign(pair, inters[1]); + CGAL_assertion(ok); + return pair.first; } return pair.first; } @@ -244,14 +248,16 @@ namespace internal { intersection(bis_pq, l_inf, std::back_inserter(inters)); std::pair pair; - CGAL_assertion(assign(pair,inters[0])); - assign(pair,inters[0]); - CGAL_assertion(pair.second == 1); + CGAL_assertion_code(bool ok=) + assign(pair,inters[0]); + CGAL_assertion(ok); + CGAL_assertion(pair.second == 1); if(_gt.less_y_2_object()(p, q)) return Line_arc_2(bis_pq,a,pair.first); - CGAL_assertion(assign(pair,inters[1])); - assign(pair,inters[1]); + CGAL_assertion_code(bool ok=) + assign(pair,inters[1]); + CGAL_assertion(ok); CGAL_assertion(pair.second == 1); return Line_arc_2(bis_pq,a,pair.first); } @@ -267,8 +273,9 @@ namespace internal { intersection(*c_pq, l_inf, std::back_inserter(inters)); std::pair pair; - CGAL_assertion(assign(pair,inters[0])); - assign(pair,inters[0]); + CGAL_assertion_code(bool ok=) + assign(pair,inters[0]); + CGAL_assertion(ok); CGAL_assertion(pair.second == 1); Hyperbolic_point_2 approx_pinf(to_double(pair.first.x()), to_double(pair.first.y())); @@ -282,8 +289,9 @@ namespace internal { return Circular_arc_2(*c_pq, pair.first, a); } - CGAL_assertion(assign(pair,inters[1])); - assign(pair,inters[1]); + CGAL_assertion_code(bool ok=) + assign(pair,inters[1]); + CGAL_assertion(ok); if(_gt.orientation_2_object()(approx_c,approx_a,approx_pinf) == POSITIVE) return Circular_arc_2(*c_pq, pair.first, a); From 08320bc1b792048e36091e0edf38bfe8feceb87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 3 Dec 2024 08:58:51 +0100 Subject: [PATCH 4/5] declare only once --- ...perbolic_Delaunay_triangulation_CK_traits_2.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h index ea57ad56e8b..9f0660d0d30 100644 --- a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h +++ b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h @@ -249,15 +249,15 @@ namespace internal { std::pair pair; CGAL_assertion_code(bool ok=) - assign(pair,inters[0]); + assign(pair,inters[0]); CGAL_assertion(ok); - CGAL_assertion(pair.second == 1); + CGAL_assertion(pair.second == 1); if(_gt.less_y_2_object()(p, q)) return Line_arc_2(bis_pq,a,pair.first); - CGAL_assertion_code(bool ok=) - assign(pair,inters[1]); - CGAL_assertion(ok); + CGAL_assertion_code(ok=) + assign(pair,inters[1]); + CGAL_assertion(ok); CGAL_assertion(pair.second == 1); return Line_arc_2(bis_pq,a,pair.first); } @@ -274,7 +274,7 @@ namespace internal { std::pair pair; CGAL_assertion_code(bool ok=) - assign(pair,inters[0]); + assign(pair,inters[0]); CGAL_assertion(ok); CGAL_assertion(pair.second == 1); @@ -289,8 +289,8 @@ namespace internal { return Circular_arc_2(*c_pq, pair.first, a); } - CGAL_assertion_code(bool ok=) - assign(pair,inters[1]); + CGAL_assertion_code(ok=) + assign(pair,inters[1]); CGAL_assertion(ok); if(_gt.orientation_2_object()(approx_c,approx_a,approx_pinf) == POSITIVE) return Circular_arc_2(*c_pq, pair.first, a); From b33ce790b872b6abac2ff17d35a454389e7c6c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 3 Dec 2024 09:12:38 +0100 Subject: [PATCH 5/5] remove tabs --- ...rbolic_Delaunay_triangulation_CK_traits_2.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h index 9f0660d0d30..1dce4427198 100644 --- a/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h +++ b/Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h @@ -78,17 +78,17 @@ namespace internal { intersection(*c_pq, *c_qr, std::back_inserter(inters)); CGAL_assertion_code(bool ok=) - assign(pair, inters[0]); - CGAL_assertion(ok); - if(pair.second == 1) + assign(pair, inters[0]); + CGAL_assertion(ok); + if(pair.second == 1) { if(_gt.has_on_bounded_side_2_object()(l_inf, pair.first)) return pair.first; CGAL_assertion_code(bool ok=) - assign(pair, inters[1]); + assign(pair, inters[1]); CGAL_assertion(ok); - return pair.first; + return pair.first; } return pair.first; } @@ -109,7 +109,7 @@ namespace internal { intersection(*l, *c, std::back_inserter(inters)); CGAL_assertion_code(bool ok=) - assign(pair,inters[0]); + assign(pair,inters[0]); CGAL_assertion(ok); if(pair.second == 1) { @@ -117,9 +117,9 @@ namespace internal { return pair.first; CGAL_assertion_code(bool ok=) - assign(pair, inters[1]); - CGAL_assertion(ok); - return pair.first; + assign(pair, inters[1]); + CGAL_assertion(ok); + return pair.first; } return pair.first; }