fix bug in conflict resolution #4375
Merged
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
MoKob
commented
Aug 7, 2017
| @@ -773,17 +774,18 @@ void TurnHandler::handleDistinctConflict(const EdgeID via_edge, | |||
| return; | |||
| } | |||
|
|
|||
| if (getTurnDirection(left.angle) == DirectionModifier::Right) | |||
| // turn to the right | |||
| if (getTurnDirection(left.angle) <= 180) | |||
There was a problem hiding this comment.
this is the main bug here. By checking for the modifier, we do not use right turns when the angles involved are slight/sharp
There was a problem hiding this comment.
Urgh this compiled because of the enum not being a strong typedef, right?
MoKob
commented
Aug 7, 2017
| { | ||
| if (angularDeviation(left.angle, 85) >= angularDeviation(right.angle, 85)) | ||
| { | ||
| left.instruction = {left_type, DirectionModifier::Right}; | ||
| right.instruction = {right_type, DirectionModifier::SharpRight}; | ||
| left.instruction = {left_type, DirectionModifier::SlightRight}; |
There was a problem hiding this comment.
I notices this bug in the process of fixing the above.
Left is farther away from a 90 degree turn than right. So left cannot be a stronger turn than right.
These two were mixed up.
daniel-j-h
approved these changes
Aug 10, 2017
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.
Issue
resolves #4374