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

feat(goal_planner): change pull over path candidate priority with soft and hard margins #6412

Merged

Conversation

kosuke55
Copy link
Contributor

@kosuke55 kosuke55 commented Feb 14, 2024

Description

change path priority.

before

shift (soft) → shift (hard) → arc_forward(soft) → arc_forward (hard) → arc_backward (soft) → arc_backward (hard)

after

shift(soft1) → shift(soft2) →…→ arc_forward(soft1) → arc_forward (soft1) → … → arc_backward (soft1) → arc_backward (soft2) → … → shift (hard) → arc_forward(hard) → arc_backward (hard)

image

image

tier4 internal ticket
https://tier4.atlassian.net/browse/RT1-4623

Tests performed

psim
https://evaluation.tier4.jp/evaluation/reports/e55d8582-2192-59b9-bbe4-81d8e04d3c81?project_id=prd_jt

Effects on system behavior

Not applicable.

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.

@github-actions github-actions bot added type:documentation Creating or refining documentation. (auto-assigned) component:planning Route planning, decision-making, and navigation. (auto-assigned) labels Feb 14, 2024
@kosuke55 kosuke55 force-pushed the feet/goal_planner_soft_hard_margin branch 2 times, most recently from 387e5f0 to 4cf21a2 Compare February 14, 2024 14:58
@kosuke55 kosuke55 added the tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Feb 14, 2024
@kosuke55 kosuke55 force-pushed the feet/goal_planner_soft_hard_margin branch from 4cf21a2 to fd548fe Compare February 14, 2024 17:21
Copy link

codecov bot commented Feb 14, 2024

Codecov Report

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

Comparison is base (c9e6dda) 14.99% compared to head (cc5436c) 14.99%.
Report is 2 commits behind head on main.

Files Patch % Lines
...th_goal_planner_module/src/goal_planner_module.cpp 0.00% 55 Missing ⚠️
.../behavior_path_goal_planner_module/src/manager.cpp 0.00% 5 Missing ⚠️
...ior_path_goal_planner_module/src/goal_searcher.cpp 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6412      +/-   ##
==========================================
- Coverage   14.99%   14.99%   -0.01%     
==========================================
  Files        1838     1838              
  Lines      127099   127116      +17     
  Branches    38075    38065      -10     
==========================================
  Hits        19062    19062              
- Misses      86715    86732      +17     
  Partials    21322    21322              
Flag Coverage Δ *Carryforward flag
differential 0.00% <0.00%> (?)
total 15.00% <ø> (+<0.01%) ⬆️ Carriedforward from c9e6dda

*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.

@soblin soblin added the tag:deploy-docs Mark for deploy-docs action generation. (used-by-ci) label Feb 15, 2024
…t and hard margins

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

tmp
Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
@kosuke55 kosuke55 force-pushed the feet/goal_planner_soft_hard_margin branch from fd548fe to cc5436c Compare February 15, 2024 03:04
@kosuke55
Copy link
Contributor Author

this PR include typo fix not related this PR

Comment on lines +756 to +761
const std::vector<double> margins = std::invoke([&]() {
std::vector<double> combined_margins = soft_margins;
combined_margins.insert(combined_margins.end(), hard_margins.begin(), hard_margins.end());
return combined_margins;
});

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
const std::vector<double> margins = std::invoke([&]() {
std::vector<double> combined_margins = soft_margins;
combined_margins.insert(combined_margins.end(), hard_margins.begin(), hard_margins.end());
return combined_margins;
});
std::vector<double> margins = soft_margins;
margins.insert(margins.end(), hard_margins.begin(), hard_margins.end());

[super nits] simpler?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I like const...

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 soblin merged commit bad6680 into autowarefoundation:main Feb 20, 2024
27 of 32 checks passed
@soblin soblin deleted the feet/goal_planner_soft_hard_margin branch February 20, 2024 11:13
StepTurtle pushed a commit to StepTurtle/autoware.universe that referenced this pull request Feb 28, 2024
…t and hard margins (autowarefoundation#6412)

* feat(goal_planner): change pull over path candidate priority with soft and hard margins

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

tmp

* fix typo

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

---------

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
HansRobo pushed a commit that referenced this pull request Mar 12, 2024
…t and hard margins (#6412)

* feat(goal_planner): change pull over path candidate priority with soft and hard margins

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

tmp

* fix typo

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

---------

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
Signed-off-by: Kotaro Yoshimoto <pythagora.yoshimoto@gmail.com>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request Jun 3, 2024
…t and hard margins (autowarefoundation#6412)

* feat(goal_planner): change pull over path candidate priority with soft and hard margins

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

tmp

* fix typo

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

---------

Signed-off-by: kosuke55 <kosuke.tnp@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) tag:deploy-docs Mark for deploy-docs action generation. (used-by-ci) tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) type:documentation Creating or refining documentation. (auto-assigned)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants