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(behavior_path_planner): disable avoidance if ego is not on preferred lane #2781

Merged

Conversation

rej55
Copy link
Contributor

@rej55 rej55 commented Jan 30, 2023

Signed-off-by: Fumiya Watanabe rej55.g@gmail.com

Description

Before this change, if ego vehicle is near of the objects, avoidance is preferred over lane change.
To fix this behavior, in this change, it disables avoidance module if ego vehicle is not on preferred lane.

Related links

Tests performed

Tested in planning simulator.

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.

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>
@github-actions github-actions bot added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Jan 30, 2023
@rej55 rej55 changed the title fix(behavior_path_planner): disable avoidance in preferred lane fix(behavior_path_planner): disable avoidance if ego is not in preferred lane Jan 30, 2023
@rej55 rej55 changed the title fix(behavior_path_planner): disable avoidance if ego is not in preferred lane fix(behavior_path_planner): disable avoidance if ego is not on preferred lane Jan 30, 2023
@tkimura4
Copy link
Contributor

The avoidance module works when the ego-car is in preffered-lane
image

Only lane change module works when the ego-car is not in preffered-lane
image

const auto current_lanes = util::getCurrentLanes(planner_data_);
lanelet::ConstLanelet current_lane;
lanelet::utils::query::getClosestLanelet(
current_lanes, planner_data_->self_pose->pose, &current_lane);
Copy link
Contributor

@tkimura4 tkimura4 Jan 31, 2023

Choose a reason for hiding this comment

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

planner_data_->self_pose->pose

In the latest code, this has been replaced with planner_data_->self_odometry->pose.pose.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done
8f9311f

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>
@rej55 rej55 force-pushed the fix/disable_avoidance_in_preferred_lane branch from b82c3d7 to 8f9311f Compare January 31, 2023 02:27
@codecov
Copy link

codecov bot commented Jan 31, 2023

Codecov Report

Base: 11.66% // Head: 11.55% // Decreases project coverage by -0.12% ⚠️

Coverage data is based on head (8f9311f) compared to base (140a92b).
Patch coverage: 0.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2781      +/-   ##
==========================================
- Coverage   11.66%   11.55%   -0.12%     
==========================================
  Files        1314     1314              
  Lines       91572    92459     +887     
  Branches    24366    25050     +684     
==========================================
  Hits        10681    10681              
- Misses      69740    70567     +827     
- Partials    11151    11211      +60     
Flag Coverage Δ *Carryforward flag
differential 4.69% <0.00%> (?)
total 11.66% <0.00%> (ø) Carriedforward from 140a92b

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

Impacted Files Coverage Δ
...er/src/scene_module/avoidance/avoidance_module.cpp 0.00% <0.00%> (ø)

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.

@tkimura4 tkimura4 merged commit cd546b5 into autowarefoundation:main Jan 31, 2023
lexavtanke pushed a commit to lexavtanke/autoware.universe that referenced this pull request Jan 31, 2023
…red lane (autowarefoundation#2781)

* fix(behavior_path_planner): disable avoidance in preferred lane

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>

* fix(behavior_path_planner): use odometry

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>

---------

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>
Signed-off-by: Alexey Panferov <lexavtanke@gmail.com>
asana17 pushed a commit to asana17/autoware.universe that referenced this pull request Feb 8, 2023
…red lane (autowarefoundation#2781)

* fix(behavior_path_planner): disable avoidance in preferred lane

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>

* fix(behavior_path_planner): use odometry

Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>

---------

Signed-off-by: Fumiya Watanabe <rej55.g@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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants