fix: add condition to handle_imperfect_touch #1346
Open
+83
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
barendgehrels
commented
Nov 20, 2024
| @@ -66,12 +73,6 @@ struct side_calculator | |||
| inline int pk_wrt_q2() const { return m_side_strategy.apply(get_qj(), get_qk(), get_pk()); } | |||
| inline int qk_wrt_p2() const { return m_side_strategy.apply(get_pj(), get_pk(), get_qk()); } | |||
|
|
|||
| // Necessary when rescaling turns off: | |||
There was a problem hiding this comment.
Moved above to order i, j, k
barendgehrels
commented
Nov 20, 2024
| @@ -674,6 +682,7 @@ struct touch : public base_turn_handler | |||
| { | |||
| if (side_qk_p1 == 0 && side_pk_q1 == 0 | |||
| && has_pk && has_qk | |||
| && opposite(side.pi_wrt_q1(), side.qk_wrt_p2()) | |||
There was a problem hiding this comment.
This is the fix
barendgehrels
force-pushed
the
fix/issue-1345
branch
from
6688aa8
to
cd4deda
Compare
barendgehrels
commented
Nov 20, 2024
| static std::string issue_1345_a[2] = | ||
| { | ||
| // Needs check for opposite in handle_imperfect_touch | ||
| R""""( |
There was a problem hiding this comment.
@vissarion this is (AFAIK) the first case written in this new multi-line format.
It doesn't have all those quotes and reflects the reported case.
Like it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1345
Difference was wrong for both cases, caused by nearly opposite segments. The condition causing this had to be finetuned with an extra check.
Fixed behaviour:
a (
p=big polygon containing all,q=small rectangle at top which subtly overlapsp)Difference a-b (in image, this should be a rectangle, correct)
Difference b-a -> 0 (correct)
b (
p= u-shape,q= the lower bar of it, subtly overlappingp)Difference
a-b(in image, this should be the two vertical bars of the u, correct)Difference
b-a-> 0 (correct)