Skip to content

Cleaning two headers. #4022

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

Closed
switzel wants to merge 1 commit into from
Closed

Cleaning two headers. #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions ...ion_2/demo/Hyperbolic_triangulation_2/include/internal/Qt/HyperbolicVoronoiGraphicsItem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,23 +99,13 @@ VoronoiGraphicsItem<DT>::paint(QPainter *painter, const QStyleOptionGraphicsItem

painter->setPen(edgesPen());

// delete
QPen temp = painter->pen();
QPen old = temp;
temp.setWidthF(0.01);
painter->setPen(temp);
//

for(typename DT::All_edges_iterator eit = dt->all_edges_begin();
eit != dt->all_edges_end();
eit++)
{
typename DT::Hyperbolic_segment s = dt->dual(*eit);
pos << s;
}

// delete
painter->setPen(old);
Comment on lines -102 to -118
Copy link
Copy Markdown
Member

@imiordanov imiordanov Oct 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be OK, it's a part of the demo and it has no critical impact on the actual code.

}


Expand Down
4 changes: 2 additions & 2 deletions Hyperbolic_triangulation_2/include/CGAL/Hyperbolic_Delaunay_triangulation_traits_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ class Construct_hyperbolic_bisector_2
{
CGAL_triangulation_precondition((_gt.orientation_2_object()(p, q, r) == ON_POSITIVE_SIDE) &&
(_gt.orientation_2_object()(p, s, q) == ON_POSITIVE_SIDE));
CGAL_triangulation_precondition((_gt.side_of_oriented_circle_2_object()(p, q, r,s) == ON_NEGATIVE_SIDE) &&
(_gt.side_of_oriented_circle_2_object()(p, s, q, r) == ON_NEGATIVE_SIDE));
Comment on lines -379 to -380
Copy link
Copy Markdown
Member

@imiordanov imiordanov Oct 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This precondition asserts that the faces (p,q,r) does not contain s, and the face (p,s,q) does not contain r, which is satisfied if the two faces (p,q,r) and (p,s,q) are Delaunay. If the assertion is failing, I feel like more investigation is needed, instead of just commenting out the check altogether.

Copy link
Copy Markdown
Member

@MoniqueTeillaud MoniqueTeillaud Oct 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, just commenting out is dangerous.
I am a bit surprised that, if the assertion is problematic, this has not been detected by the test-suite...

Copy link
Copy Markdown
Member

@lrineau lrineau Oct 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@switzel Can you comment on why you removed that precondition?

Copy link
Copy Markdown
Member

@lrineau lrineau Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping @switzel!

/*CGAL_triangulation_precondition((_gt.side_of_oriented_circle_2_object()(p, q, r,s) == ON_NEGATIVE_SIDE) &&
(_gt.side_of_oriented_circle_2_object()(p, s, q, r) == ON_NEGATIVE_SIDE));*/

Construct_hyperbolic_circumcenter_2<Traits> chc(_gt);
Construct_circle_or_line_supporting_bisector<Traits> cclsb(_gt);
Expand Down