Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed mandatory code in CGAL_assert #8635

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixed mandatory code in CGAL_assert #8635

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1dd034
fixed mandatory code in CGAL_assert
pougetma Dec 2, 2024
52c9f71
applied Seb suggestion
pougetma Dec 2, 2024
e255108
declare only once
sloriot Dec 3, 2024
01b75f8
remove tabs
sloriot Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_CK_traits_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
sloriot marked this conversation as resolved.
Show resolved Hide resolved
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;
Expand All @@ -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;
Expand Down Expand Up @@ -241,11 +245,13 @@ namespace internal {
std::pair<Circular_arc_point_2, unsigned> 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);
}
Expand All @@ -262,6 +268,7 @@ namespace internal {
std::pair<Circular_arc_point_2, unsigned> 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()));
Expand All @@ -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);

Expand Down
Loading