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

refactor(avoidance_by_lane_change): reuse lane change class #3577

Conversation

zulfaqar-azmi-t4
Copy link
Contributor

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 commented Apr 28, 2023

Description

Currently, avoidance_by_lane_change module has similar implementation to lane change module, with exceptions of path generation functions.

The PR aims to unify avoidance_by_lane_change to lane change module.
The PR moves scene_module/avoidance_by_lc/* content to scene_module/lane_change/avoidance_by_lane_change and a introduces new class AvoidanceByLaneChangeInterface that inherits from the LaneChangeInterface, with overriden updateRTCStatus. It also improves the maintainability and style of some of the existing classes.

Related links

None

Tests performed

  1. Build with COMPILE_WITH_OLD_ARCHITECTURE=TRUE
  2. Build with COMPILE_WITH_OLD_ARCHITECTURE=FALSE
  3. Scenario test with old architecture TIER IV internal link - No degradation
  4. Scenario test with new architecture TIER IV internal link - Degradation at Avoidance, but AbLC is not enabled, therefore no degradation assumed
  5. Test with planning simulator

Notes for reviewers

  1. avoidance_by_lc module folder is removed.
  2. duplicated getLaneChangePaths in utils::lane_change is removed.
  3. due to the confusion of parameter naming, parameters_ is changed to lane_change_parameters_
avoidance_by_lane_change-.2023-05-01-11-53-39.mp4
avoidance_by_lane_change-.2023-05-01-11-54-17.mp4

Interface changes

None

Effects on system behavior

None

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.

@github-actions github-actions bot added component:planning Route planning, decision-making, and navigation. (auto-assigned) component:common Common packages from the autoware-common repository. (auto-assigned) labels Apr 28, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-interface-and-module branch from ab2359e to 16be270 Compare May 1, 2023 00:59
@github-actions github-actions bot removed the component:common Common packages from the autoware-common repository. (auto-assigned) label May 1, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-interface-and-module branch from 7ac9f85 to 31c9179 Compare May 1, 2023 03:09
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 self-assigned this May 1, 2023
@codecov
Copy link

codecov bot commented May 1, 2023

Codecov Report

Patch coverage: 1.25% and project coverage change: +0.01 🎉

Comparison is base (b173491) 13.72% compared to head (a4ce35f) 13.74%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3577      +/-   ##
==========================================
+ Coverage   13.72%   13.74%   +0.01%     
==========================================
  Files        1397     1398       +1     
  Lines       98263    98130     -133     
  Branches    29238    29158      -80     
==========================================
+ Hits        13490    13491       +1     
+ Misses      70233    70096     -137     
- Partials    14540    14543       +3     
Flag Coverage Δ *Carryforward flag
differential 12.89% <1.25%> (?)
total 13.76% <ø> (+0.04%) ⬆️ Carriedforward from b173491

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

Impacted Files Coverage Δ
...th_planner/scene_module/lane_change/base_class.hpp 10.86% <0.00%> (-0.50%) ⬇️
...ath_planner/scene_module/lane_change/interface.hpp 33.33% <ø> (+24.24%) ⬆️
...r_path_planner/scene_module/lane_change/normal.hpp 100.00% <ø> (ø)
...or_path_planner/src/behavior_path_planner_node.cpp 20.02% <0.00%> (-0.06%) ⬇️
...lanner/src/scene_module/avoidance_by_lc/module.cpp 0.00% <ø> (ø)
...ne_module/lane_change/avoidance_by_lane_change.cpp 0.00% <0.00%> (ø)
...planner/src/scene_module/lane_change/interface.cpp 14.45% <0.00%> (-2.76%) ⬇️
...avior_path_planner/src/utils/lane_change/utils.cpp 0.81% <ø> (+0.11%) ⬆️
...th_planner/src/scene_module/lane_change/normal.cpp 6.74% <6.25%> (-0.03%) ⬇️
...nner/utils/lane_change/lane_change_module_data.hpp 50.00% <100.00%> (+50.00%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: Muhammad Zulfaqar <[email protected]>
Signed-off-by: Muhammad Zulfaqar <[email protected]>
Signed-off-by: Muhammad Zulfaqar <[email protected]>
This reverts commit 16be270.
Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>
Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>
Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-interface-and-module branch from 728af6f to a4ce35f Compare May 3, 2023 10:49
Copy link
Contributor

@satoshi-ota satoshi-ota left a comment

Choose a reason for hiding this comment

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

LGTM

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 merged commit de8afd7 into autowarefoundation:main May 8, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 deleted the refactor-avoidance-by-lc-interface-and-module branch May 8, 2023 01:50
Mingyu1991 pushed a commit to Mingyu1991/autoware.universe that referenced this pull request Jun 26, 2023
…foundation#3577)

* refactor(avoidance_by_lane_change): reuse lane change class

Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>

* fix wrong direction

Signed-off-by: Muhammad Zulfaqar <[email protected]>

* fix conflict

Signed-off-by: Muhammad Zulfaqar <[email protected]>

* fix rtc paramters

Signed-off-by: Muhammad Zulfaqar <[email protected]>

* Revert "fix rtc paramters"

This reverts commit 16be270.

* fix rtc

Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>

* fix pre-commit

Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>

* fix pre-commit and move updateRTCStatus to cpp file

Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>

* COMPILE_WITH_OLD_ARCHITECTURE=TRUE

Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>

---------

Signed-off-by: Muhammad Zulfaqar Azmi <[email protected]>
Signed-off-by: Muhammad Zulfaqar <[email protected]>
Signed-off-by: Mingyu Li <[email protected]>
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