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(avoidance): output unconfortable path with unsafe state #4536

Merged

Conversation

satoshi-ota
Copy link
Contributor

@satoshi-ota satoshi-ota commented Aug 7, 2023

Description

🤖 Generated by Copilot at 816a70f

Refactor AvoidanceModule class to improve shift line planning for obstacle avoidance. Add isComfortable function and comfortable flag to filter out uncomfortable shift lines.


Add some options to configurate avoidance policy.

      policy:
        # policy for vehicle slow down behavior. select "best_effort" or "reliable".
        # "best_effort": slow down deceleration & jerk are limited by constraints.
        #                but there is a possibility that the vehicle can't stop in front of the vehicle.
        # "reliable": insert stop or slow down point with ignoring decel/jerk constraints.
        #             make it possible to increase chance to avoid but uncomfortable deceleration maybe happen.
        deceleration: "best_effort"                     # [-]
        # policy for avoidance lateral margin. select "best_effort" or "reliable".
        # "best_effort": output avoidance path with shorten lateral margin when there is no enough longitudinal
        #                margin to avoid.
        # "reliable": module output avoidance path with safe (rtc cooperate) state only when the vehicle can avoid
        #             with expected lateral margin.
        lateral_margin: "best_effort"                   # [-]
        # if true, module doesn't wait deceleration and outputs avoidance path by best effort margin.
        use_shorten_margin_immediately: true            # [-]

Additionally, make it possible to output unsafe (=lateral jerk exceeds limit value) path with unsafe state.

simplescreenrecorder-2023-08-09_12.05.53.mp4

Tests performed

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.

@github-actions github-actions bot added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Aug 7, 2023
@satoshi-ota satoshi-ota force-pushed the feat/output-unconfortable-path branch from 816a70f to 71f810d Compare August 8, 2023 09:42
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
@codecov
Copy link

codecov bot commented Aug 9, 2023

Codecov Report

Patch coverage: 4.16% and project coverage change: -0.04% ⚠️

Comparison is base (9ac8faf) 14.80% compared to head (55a467c) 14.77%.
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4536      +/-   ##
==========================================
- Coverage   14.80%   14.77%   -0.04%     
==========================================
  Files        1527     1527              
  Lines      105673   105990     +317     
  Branches    32107    32314     +207     
==========================================
+ Hits        15649    15660      +11     
- Misses      72945    73224     +279     
- Partials    17079    17106      +27     
Flag Coverage Δ *Carryforward flag
differential 13.13% <4.16%> (?)
total 14.81% <ø> (+<0.01%) ⬆️ Carriedforward from 9ac8faf

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

Files Changed Coverage Δ
...lanner/scene_module/avoidance/avoidance_module.hpp 7.93% <0.00%> (-0.40%) ⬇️
..._planner/utils/avoidance/avoidance_module_data.hpp 0.00% <ø> (ø)
...ath_planner/src/scene_module/avoidance/manager.cpp 6.86% <0.00%> (-0.22%) ⬇️
...ehavior_path_planner/src/utils/avoidance/utils.cpp 6.56% <0.00%> (ø)
...er/src/scene_module/avoidance/avoidance_module.cpp 12.17% <9.09%> (+0.08%) ⬆️

... and 2 files with indirect coverage changes

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

@tkimura4 tkimura4 merged commit 1680656 into autowarefoundation:main Aug 10, 2023
@satoshi-ota satoshi-ota deleted the feat/output-unconfortable-path branch August 10, 2023 03:08
@@ -616,28 +622,28 @@ void AvoidanceModule::updateEgoBehavior(const AvoidancePlanningData & data, Shif
return;
}

insertPrepareVelocity(path);
// insertPrepareVelocity(path);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tkimura4 @shmpwk Sorry, I fogot to remove // before merge. I create fix PR right now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

tkimura4 pushed a commit to tier4/autoware.universe that referenced this pull request Aug 15, 2023
…efoundation#4536)

* feat(avoidance): output unconfortable path with unsafe state

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

* feat(avoidance): make it selectable avoidance policy

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
LeoDriveProject pushed a commit to leo-drive/autoware.universe.golf that referenced this pull request Aug 16, 2023
…efoundation#4536)

* feat(avoidance): output unconfortable path with unsafe state

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

* feat(avoidance): make it selectable avoidance policy

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>

---------

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