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(mission_planner, route_handler): enable loop detection of route #1705

Merged
merged 6 commits into from
Sep 5, 2022

Conversation

tkimura4
Copy link
Contributor

@tkimura4 tkimura4 commented Aug 26, 2022

Signed-off-by: tomoya.kimura tomoya.kimura@tier4.jp

Description

In the current implementation, isRouteLooped() always returns false because one primitives has only one id.
Duplicate check of lane_id must be done for the entire segments. I fixed it.

Related links

Tests performed

I confirmed that the following error occurs and route was not published when I tried to set route with overlapping lanes using check points.
image

Notes for reviewers

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.

@tkimura4 tkimura4 marked this pull request as draft August 26, 2022 08:09
@tkimura4 tkimura4 marked this pull request as ready for review August 26, 2022 08:42
@yukkysaito
Copy link
Contributor

@mitsudome-r -san is added because I think he did it first.

@codecov
Copy link

codecov bot commented Aug 26, 2022

Codecov Report

Merging #1705 (fad7354) into main (73bd233) will decrease coverage by 0.26%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             main    #1705      +/-   ##
==========================================
- Coverage   10.42%   10.16%   -0.27%     
==========================================
  Files        1220     1148      -72     
  Lines       87342    77162   -10180     
  Branches    20490    19187    -1303     
==========================================
- Hits         9109     7844    -1265     
+ Misses      68757    60204    -8553     
+ Partials     9476     9114     -362     
Flag Coverage Δ *Carryforward flag
differential 2.47% <0.00%> (?)
total 10.31% <0.00%> (-0.11%) ⬇️ Carriedforward from 73bd233

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

Impacted Files Coverage Δ
...sion_planner_lanelet2/mission_planner_lanelet2.cpp 0.00% <0.00%> (ø)
planning/route_handler/src/route_handler.cpp 0.00% <0.00%> (ø)
system/default_ad_api/src/interface.cpp 0.00% <0.00%> (-71.43%) ⬇️
...c/autoware_ad_api_msgs/msg/route__type_support.cpp 0.00% <0.00%> (-66.67%) ⬇️
...oware_ad_api_msgs/msg/route_data__type_support.cpp 0.00% <0.00%> (-66.67%) ⬇️
...ware_ad_api_msgs/msg/route_state__type_support.cpp 0.00% <0.00%> (-66.67%) ⬇️
...re_ad_api_msgs/msg/route_segment__type_support.cpp 0.00% <0.00%> (-66.67%) ⬇️
..._ad_api_msgs/msg/response_status__type_support.cpp 0.00% <0.00%> (-66.67%) ⬇️
..._ad_api_msgs/msg/route_primitive__type_support.cpp 0.00% <0.00%> (-66.67%) ⬇️
...ng_simulator/vehicle_model/sim_model_interface.hpp 0.00% <0.00%> (-66.67%) ⬇️
... and 755 more

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

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
@TakaHoribe TakaHoribe self-requested a review August 29, 2022 08:26
Copy link
Contributor

@TakaHoribe TakaHoribe left a comment

Choose a reason for hiding this comment

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

LGTM!

@taikitanaka3
Copy link
Contributor

@tkimura4
can you resolve this conflict?

…cted

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
@tkimura4
Copy link
Contributor Author

tkimura4 commented Sep 5, 2022

@taikitanaka3
resolved! 🐶

Copy link
Contributor

@taikitanaka3 taikitanaka3 left a comment

Choose a reason for hiding this comment

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

LGTM
I confirmed there is no warning like before this PR
image

@taikitanaka3 taikitanaka3 enabled auto-merge (squash) September 5, 2022 08:46
@taikitanaka3 taikitanaka3 merged commit da6f7f4 into autowarefoundation:main Sep 5, 2022
@taikitanaka3 taikitanaka3 deleted the fix/route_loop_detected branch September 5, 2022 09:41
boyali pushed a commit to boyali/autoware.universe that referenced this pull request Sep 28, 2022
…utowarefoundation#1705)

* fix(mission_planner, route_handler): enable loop detection of route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* fix undefined reference

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* do not publish looped-route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* simplify the code

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* insert -> emplace

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
boyali pushed a commit to boyali/autoware.universe that referenced this pull request Oct 3, 2022
…utowarefoundation#1705)

* fix(mission_planner, route_handler): enable loop detection of route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* fix undefined reference

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* do not publish looped-route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* simplify the code

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* insert -> emplace

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
boyali pushed a commit to boyali/autoware.universe that referenced this pull request Oct 3, 2022
…utowarefoundation#1705)

* fix(mission_planner, route_handler): enable loop detection of route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* fix undefined reference

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* do not publish looped-route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* simplify the code

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* insert -> emplace

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
boyali pushed a commit to boyali/autoware.universe that referenced this pull request Oct 19, 2022
…utowarefoundation#1705)

* fix(mission_planner, route_handler): enable loop detection of route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* fix undefined reference

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* do not publish looped-route

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* simplify the code

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* insert -> emplace

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants