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

Merge remote-tracking branch 'cgal/5.6.x-branch' into 6.0.x-branch

This commit is contained in:
Sébastien Loriot 2024-12-04 14:12:00 +01:00
parent 65d40089b3 e6c6f223c8
commit b8874a23ad
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h
View File

@ -77,13 +77,17 @@ namespace internal {
std::vector< Intersection_result > inters;
intersection(*c_pq, *c_qr, std::back_inserter(inters));
CGAL_assertion(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]));
CGAL_assertion_code(bool ok=)
assign(pair, inters[1]);
CGAL_assertion(ok);
return pair.first;
}
return pair.first;
@ -104,13 +108,17 @@ namespace internal {
std::vector< Intersection_result > inters;
intersection(*l, *c, std::back_inserter(inters));
CGAL_assertion(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]));
CGAL_assertion_code(bool ok=)
assign(pair, inters[1]);
CGAL_assertion(ok);
return pair.first;
}
return pair.first;
@ -240,12 +248,16 @@ namespace internal {
intersection(bis_pq, l_inf, std::back_inserter(inters));
std::pair<Circular_arc_point_2, unsigned> pair;
CGAL_assertion(assign(pair,inters[0]));
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]));
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);
}
@ -261,7 +273,9 @@ namespace internal {
intersection(*c_pq, l_inf, std::back_inserter(inters));
std::pair<Circular_arc_point_2, unsigned> pair;
CGAL_assertion(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()));
@ -275,7 +289,9 @@ namespace internal {
return Circular_arc_2(*c_pq, pair.first, a);
}
CGAL_assertion(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);

3
Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_io.cpp
View File

@ -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<Point> points;