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): update execution condition #5869

Conversation

zulfaqar-azmi-t4
Copy link
Contributor

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 commented Dec 14, 2023

Description

🤖[deprecated] Generated by Copilot at 2147884

This pull request improves the lane change module for path avoidance by simplifying the logic, adding more flexibility, and enhancing the logging. It refactors the specialRequiredCheck function in scene.cpp, extends the lane_change::utils functions in utils.cpp, adds a new processOnEntry function in interface.hpp and interface.cpp, and modifies the logger name in base_class.hpp.

Related links

None

Tests performed

PSIM and evaluator

Notes for reviewers

None

Interface changes

Avoidance by lane change has higher priorities, so if previously, in the case where obstacle + lane change module is activated, now avoidance by lane change will be activated instead.

Effects on system behavior

Avoidance by lane change has higher priorities, so if previously, in the case where obstacle + lane change module is activated, now avoidance by lane change will be activated instead.

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 the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Dec 14, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-execution-condition branch from 2147884 to 3147a9e Compare December 14, 2023 14:37
@github-actions github-actions bot added the component:launch Launch files, scripts and initialization tools. (auto-assigned) label Dec 14, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-execution-condition branch 3 times, most recently from 67e9029 to a7c81dc Compare December 15, 2023 15:34
@github-actions github-actions bot removed the component:launch Launch files, scripts and initialization tools. (auto-assigned) label Dec 15, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-execution-condition branch from a7c81dc to 5dfee2e Compare December 16, 2023 22:28
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-execution-condition branch from 5dfee2e to 02411db Compare December 18, 2023 05:11
@github-actions github-actions bot added component:launch Launch files, scripts and initialization tools. (auto-assigned) and removed component:launch Launch files, scripts and initialization tools. (auto-assigned) labels Dec 18, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 marked this pull request as ready for review December 18, 2023 07:02
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-execution-condition branch from bb4142f to ae6c037 Compare December 18, 2023 07:05
@satoshi-ota satoshi-ota self-assigned this Dec 18, 2023
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
zulfaqar-azmi-t4 and others added 4 commits December 19, 2023 09:46
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
…avoidance_module/parameter_helper.hpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-avoidance-by-lc-execution-condition branch from ae6c037 to 9b9f497 Compare December 19, 2023 00:47
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 👍 I confirmed that normal LC was kicked and AbLC was launched instead.

simplescreenrecorder-2023-12-19_13.40.13.mp4

@satoshi-ota satoshi-ota added the run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Dec 19, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 enabled auto-merge (squash) December 19, 2023 05:02
Copy link

codecov bot commented Dec 19, 2023

Codecov Report

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

Comparison is base (320bc2f) 15.29% compared to head (9b9f497) 15.29%.
Report is 6 commits behind head on main.

Files Patch % Lines
...ehavior_path_avoidance_module/parameter_helper.hpp 6.43% 7 Missing and 211 partials ⚠️
...path_avoidance_by_lane_change_module/src/scene.cpp 3.70% 25 Missing and 1 partial ⚠️
...th_avoidance_by_lane_change_module/src/manager.cpp 11.11% 0 Missing and 8 partials ⚠️
...ning/behavior_path_planner/src/planner_manager.cpp 16.66% 5 Missing ⚠️
...havior_path_lane_change_module/src/utils/utils.cpp 60.00% 2 Missing ⚠️
...h_avoidance_by_lane_change_module/data_structs.hpp 0.00% 0 Missing and 1 partial ⚠️
..._avoidance_by_lane_change_module/src/interface.cpp 50.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5869   +/-   ##
=======================================
  Coverage   15.29%   15.29%           
=======================================
  Files        1747     1748    +1     
  Lines      120208   120239   +31     
  Branches    36631    36648   +17     
=======================================
+ Hits        18383    18393   +10     
- Misses      81207    81221   +14     
- Partials    20618    20625    +7     
Flag Coverage Δ *Carryforward flag
differential 9.46% <8.09%> (?)
total 15.31% <ø> (+0.01%) ⬆️ Carriedforward from 320bc2f

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

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 merged commit c9b9fca into autowarefoundation:main Dec 19, 2023
31 of 35 checks passed
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request Dec 20, 2023
…arefoundation#5869)

* refactor(avoidance_by_lane_change): update execution condition

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix lc parameter

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix both lane change and avoidance by lane change both are running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* trying to set maximum_avoid_distance

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix avoidance param not properly assigned

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fixed avoidance not running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix root lanelet

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* removed gdb

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* add debug

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix unnecessary changes

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* Update planning/behavior_path_avoidance_module/include/behavior_path_avoidance_module/parameter_helper.hpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>

---------

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
Signed-off-by: karishma <karishma@interpl.ai>
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 deleted the refactor-avoidance-by-lc-execution-condition branch December 21, 2023 03:43
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request May 26, 2024
…arefoundation#5869)

* refactor(avoidance_by_lane_change): update execution condition

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix lc parameter

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix both lane change and avoidance by lane change both are running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* trying to set maximum_avoid_distance

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix avoidance param not properly assigned

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fixed avoidance not running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix root lanelet

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* removed gdb

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* add debug

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix unnecessary changes

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* Update planning/behavior_path_avoidance_module/include/behavior_path_avoidance_module/parameter_helper.hpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>

---------

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request May 28, 2024
…arefoundation#5869)

* refactor(avoidance_by_lane_change): update execution condition

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix lc parameter

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix both lane change and avoidance by lane change both are running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* trying to set maximum_avoid_distance

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix avoidance param not properly assigned

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fixed avoidance not running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix root lanelet

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* removed gdb

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* add debug

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix unnecessary changes

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* Update planning/behavior_path_avoidance_module/include/behavior_path_avoidance_module/parameter_helper.hpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>

---------

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
Signed-off-by: karishma <karishma@interpl.ai>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request May 28, 2024
…arefoundation#5869)

* refactor(avoidance_by_lane_change): update execution condition

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix lc parameter

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix both lane change and avoidance by lane change both are running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* trying to set maximum_avoid_distance

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix avoidance param not properly assigned

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fixed avoidance not running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix root lanelet

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* removed gdb

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* add debug

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix unnecessary changes

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* Update planning/behavior_path_avoidance_module/include/behavior_path_avoidance_module/parameter_helper.hpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>

---------

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request Jun 3, 2024
…arefoundation#5869)

* refactor(avoidance_by_lane_change): update execution condition

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix lc parameter

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix both lane change and avoidance by lane change both are running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* trying to set maximum_avoid_distance

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix avoidance param not properly assigned

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fixed avoidance not running

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix root lanelet

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* removed gdb

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* add debug

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* fix unnecessary changes

Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>

* Update planning/behavior_path_avoidance_module/include/behavior_path_avoidance_module/parameter_helper.hpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>

---------

Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.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