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.

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

fix(intersection): fixed stuck vehicle stop line and refactor stop line logic #2226

Merged
merged 15 commits into from
Nov 18, 2022

Conversation

soblin
Copy link
Contributor

@soblin soblin commented Nov 7, 2022

Description

The stop position for stuck vehicle is the point which is stop_line_margin [m] behind the intersection point of conflicting lanes and path as in the attached image, but previously this stop position was the intersection point of detection lanes and path, so ego was entering the intersection improperly.

Screenshot from 2022-11-08 19-59-58

Related links

Jira link

Tests performed

Notes for reviewers

With retry=0, all related scenarios succeeded without degradation.

https://evaluation.tier4.jp/evaluation/reports/25940db8-a2ee-5760-af58-a303da3d7488?project_id=prd_jt

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

  • The PR follows the pull request guidelines.
  • The PR has been properly tested.
  • The PR has been reviewed by the code owners.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.
  • The PR is ready for merge.

After all checkboxes are checked, anyone who has write access can merge the PR.

@soblin soblin force-pushed the fix/intersection-stuck-stopline branch from 17331bc to c56d293 Compare November 7, 2022 11:33
@codecov
Copy link

codecov bot commented Nov 7, 2022

Codecov Report

Base: 11.09% // Head: 11.84% // Increases project coverage by +0.74% 🎉

Coverage data is based on head (66a48f1) compared to base (7d0e62e).
Patch coverage: 0.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2226      +/-   ##
==========================================
+ Coverage   11.09%   11.84%   +0.74%     
==========================================
  Files        1212     1117      -95     
  Lines       86617    75273   -11344     
  Branches    20845    20770      -75     
==========================================
- Hits         9607     8913     -694     
+ Misses      66850    56513   -10337     
+ Partials    10160     9847     -313     
Flag Coverage Δ *Carryforward flag
differential 4.22% <0.00%> (?)
total 11.93% <0.00%> (+0.87%) ⬆️ Carriedforward from d384aa3

*This pull request uses carry forward flags. Click here to find out more.

Impacted Files Coverage Δ
...c/scene_module/intersection/scene_intersection.cpp 0.00% <0.00%> (ø)
...ule/intersection/scene_merge_from_private_road.cpp 0.00% <0.00%> (ø)
...ity_planner/src/scene_module/intersection/util.cpp 0.00% <0.00%> (ø)
...ng_simulator/vehicle_model/sim_model_interface.hpp 0.00% <0.00%> (-66.67%) ⬇️
system/default_ad_api/src/interface.cpp 0.00% <0.00%> (-62.50%) ⬇️
system/default_ad_api/src/localization.cpp 0.00% <0.00%> (-37.50%) ⬇️
...auto_common/include/helper_functions/type_name.hpp 66.66% <0.00%> (-33.34%) ⬇️
..._utils/include/grid_map_utils/polygon_iterator.hpp 50.00% <0.00%> (-25.00%) ⬇️
...wer/include/trajectory_follower/lowpass_filter.hpp 50.00% <0.00%> (-25.00%) ⬇️
...mon/autoware_point_types/test/test_point_types.cpp 66.66% <0.00%> (-16.67%) ⬇️
... and 783 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@soblin soblin force-pushed the fix/intersection-stuck-stopline branch 3 times, most recently from 430ccb4 to 54927b0 Compare November 10, 2022 08:49
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
@soblin soblin force-pushed the fix/intersection-stuck-stopline branch from 7709f70 to 06c615b Compare November 14, 2022 07:44
@github-actions github-actions bot added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Nov 14, 2022
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
@soblin soblin marked this pull request as ready for review November 15, 2022 12:07
@shmpwk shmpwk added type:documentation Creating or refining documentation. (auto-assigned) and removed document labels Nov 16, 2022
@@ -60,6 +60,7 @@ The following process is performed for the attention targets to determine whethe
2. calculate the passing area of the target object $A_{target}$ at $t_s$ - `collision_start_margin_time` ~ $t_e$ + `collision_end_margin_time` for each predicted path (\*1).
3. check if $A_{ego}$ and $A_{target}$ regions are overlapped (has collision).
4. when a collision is detected, the module inserts a stop velocity in front of the intersection. Note that there is a time margin for the stop release (\*2).
5. If ego is over the `pass_judge_line`, collision checking is not processed to avoid sudden braking. However if ego velocity is lower than the threshold `keep_detection_vel_thr` then this module continues collision checking.
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

Copy link
Contributor

@kyoichi-sugahara kyoichi-sugahara left a comment

Choose a reason for hiding this comment

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

LGTM

@soblin
Copy link
Contributor Author

soblin commented Nov 18, 2022

@shmpwk @kosuke55 @taikitanaka3 Please approve this as code owners

@soblin soblin merged commit ba632bc into autowarefoundation:main Nov 18, 2022
@soblin soblin deleted the fix/intersection-stuck-stopline branch November 18, 2022 06:53
HansRobo pushed a commit to HansRobo/autoware.universe that referenced this pull request Dec 16, 2022
…ne logic (autowarefoundation#2226)

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
soblin added a commit to soblin/autoware.universe that referenced this pull request Dec 22, 2022
…ne logic (autowarefoundation#2226)

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
kminoda pushed a commit to kminoda/autoware.universe that referenced this pull request Jan 6, 2023
…ne logic (autowarefoundation#2226)

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: kminoda <koji.minoda@tier4.jp>
YoshiRi pushed a commit to YoshiRi/autoware.universe that referenced this pull request Jan 11, 2023
…ne logic (autowarefoundation#2226)

Signed-off-by: Mamoru Sobue <mamoru.sobue@tier4.jp>
Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:planning Route planning, decision-making, and navigation. (auto-assigned) type:documentation Creating or refining documentation. (auto-assigned)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants