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(avoidance): fix missing parent ids #5838

Merged

Conversation

satoshi-ota
Copy link
Contributor

@satoshi-ota satoshi-ota commented Dec 11, 2023

Description

🤖[deprecated] Generated by Copilot at 43f5930

This pull request adds and improves the functionality of the ShiftLineGenerator class, which generates shifted lines that avoid obstacles and respect the lane boundaries. It assigns the parent_ids field of the combined lines in shift_line_generator.cpp and optimizes the concatParentIds function in utils.cpp.

Related Ticket: https://tier4.atlassian.net/browse/RT1-4532

Fix following error:

[component_container_mt-29] [ERROR 1700802888.493218325] [planning.scenario_planning.lane_driving.behavior_planning.behavior_path_planner.avoidance] registerRawShiftLines(): avoid line for path_shifter must have parent_id.:(L887)

Tests performed

Psim

Effects on system behavior

Nothing.

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.

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.

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

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
@github-actions github-actions bot added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Dec 11, 2023
@satoshi-ota satoshi-ota added the run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Dec 11, 2023
@@ -756,11 +756,21 @@ size_t findPathIndexFromArclength(
std::vector<UUID> concatParentIds(const std::vector<UUID> & ids1, const std::vector<UUID> & ids2)
{
std::vector<UUID> ret;
for (const auto id2 : ids2) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Previously, if the ids2 is empty, return ids also becomes empty even if the ids1 is NOT empty.

@satoshi-ota satoshi-ota enabled auto-merge (squash) December 11, 2023 09:42
Copy link

codecov bot commented Dec 11, 2023

Codecov Report

Attention: 8 lines in your changes are missing coverage. Please review.

Comparison is base (f41d3fa) 15.28% compared to head (43f5930) 15.29%.
Report is 6 commits behind head on main.

Files Patch % Lines
...nning/behavior_path_avoidance_module/src/utils.cpp 0.00% 7 Missing ⚠️
...path_avoidance_module/src/shift_line_generator.cpp 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5838      +/-   ##
==========================================
+ Coverage   15.28%   15.29%   +0.01%     
==========================================
  Files        1739     1739              
  Lines      119756   120182     +426     
  Branches    36369    36657     +288     
==========================================
+ Hits        18301    18386      +85     
- Misses      80976    81252     +276     
- Partials    20479    20544      +65     
Flag Coverage Δ *Carryforward flag
differential 12.85% <0.00%> (?)
total 15.28% <ø> (+<0.01%) ⬆️ Carriedforward from f41d3fa

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@satoshi-ota satoshi-ota merged commit 8cd0628 into autowarefoundation:main Dec 11, 2023
47 of 49 checks passed
@satoshi-ota satoshi-ota deleted the fix/parent-id-avoidance branch December 11, 2023 23:48
danielsanchezaran pushed a commit to tier4/autoware.universe that referenced this pull request Dec 15, 2023
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request Dec 19, 2023
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: karishma <karishma@interpl.ai>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request Dec 19, 2023
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: karishma <karishma@interpl.ai>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request May 26, 2024
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request May 28, 2024
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request May 28, 2024
Signed-off-by: satoshi-ota <satoshi.ota928@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) run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants