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(lane_change): separate lane change and external request #5850

Conversation

zulfaqar-azmi-t4
Copy link
Contributor

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

Description

🤖[deprecated] Generated by Copilot at 4e07f4e

This pull request refactors the lane change functionality of the behavior path planner into two separate packages: behavior_path_lane_change_module and behavior_path_external_request_lane_change_module. The former handles the normal lane change behavior, while the latter handles the lane change requests from external sources. The pull request also updates the include paths, the package dependencies, the documentation, and the tests to reflect the new structure.

Tests performed

Not applicable.

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.

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 marked this pull request as draft December 12, 2023 12:40
@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 Dec 12, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-separate-lane-change-package branch 2 times, most recently from 56059cd to caa1a32 Compare December 12, 2023 15:07
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 marked this pull request as ready for review December 12, 2023 15:08
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 added the run:deploy-docs Mark for deploy-docs action generation. (used-by-ci) label Dec 12, 2023
@kyoichi-sugahara
Copy link
Contributor

@zulfaqar-azmi-t4
This line should be deleted to pass the test i think

behavior_path_planner_dir + "/config/lane_change/lane_change.param.yaml"});

@satoshi-ota
Copy link
Contributor

@zulfaqar-azmi-t4 Basically, it looks good to me. After fixing above suggestions, I'll approve this PR.

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 added the run:build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Dec 13, 2023
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-separate-lane-change-package branch from a0e40e5 to 29e8868 Compare December 13, 2023 10:31
@satoshi-ota
Copy link
Contributor

@zulfaqar-azmi-t4 colcon test seems to fail... 🤔

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 marked this pull request as draft December 14, 2023 02:16
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
pre-commit-ci bot and others added 11 commits December 14, 2023 11:16
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
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: Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
…ath_planner_node_interface.cpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
…t/test_behavior_path_planner_node_interface.cpp

Co-authored-by: Satoshi OTA <44889564+satoshi-ota@users.noreply.github.com>
Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp>
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 marked this pull request as ready for review December 14, 2023 02:56
@zulfaqar-azmi-t4 zulfaqar-azmi-t4 force-pushed the refactor-separate-lane-change-package branch from 6f370a9 to 956d411 Compare December 14, 2023 02:56
@satoshi-ota
Copy link
Contributor

@zulfaqar-azmi-t4 I missed AbLC test.

1: -- run_test.py: invoking following command in '/__w/autoware.universe/autoware.universe/build/behavior_path_avoidance_by_lane_change_module':
1:  - /__w/autoware.universe/autoware.universe/build/behavior_path_avoidance_by_lane_change_module/test_behavior_path_avoidance_by_lane_change_module --gtest_output=xml:/__w/autoware.universe/autoware.universe/build/behavior_path_avoidance_by_lane_change_module/test_results/behavior_path_avoidance_by_lane_change_module/test_behavior_path_avoidance_by_lane_change_module.gtest.xml
1: Running main() from gmock_main.cc
1: [==========] Running 2 tests from 1 test suite.
1: [----------] Global test environment set-up.
1: [----------] 2 tests from PlanningModuleInterfaceTest
1: [ RUN      ] PlanningModuleInterfaceTest.NodeTestWithExceptionRoute
1: unknown file: Failure
1: C++ exception with description "failed to parse arguments: Couldn't parse params file: '--params-file /__w/autoware.universe/autoware.universe/install/behavior_path_planner/share/behavior_path_planner/config/lane_change/lane_change.param.yaml'. Error: Error opening YAML file, at ./src/parser.c:270, at ./src/rcl/arguments.c:406" thrown in the test body.

@satoshi-ota
Copy link
Contributor

@zulfaqar-azmi-t4

ament_index_cpp::get_package_share_directory("behavior_path_planner") +
"/config/lane_change/lane_change.param.yaml",

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

codecov bot commented Dec 14, 2023

Codecov Report

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

Comparison is base (3d40702) 15.34% compared to head (555514f) 15.20%.
Report is 1 commits behind head on main.

Files Patch % Lines
...test/test_behavior_path_planner_node_interface.cpp 26.08% 0 Missing and 34 partials ⚠️
...test/test_behavior_path_planner_node_interface.cpp 26.08% 0 Missing and 34 partials ⚠️
...xternal_request_lane_change_module/src/manager.cpp 66.66% 0 Missing and 4 partials ⚠️
...test/test_behavior_path_planner_node_interface.cpp 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5850      +/-   ##
==========================================
- Coverage   15.34%   15.20%   -0.14%     
==========================================
  Files        1743     1760      +17     
  Lines      119950   121989    +2039     
  Branches    36480    37618    +1138     
==========================================
+ Hits        18401    18544     +143     
- Misses      80963    82579    +1616     
- Partials    20586    20866     +280     
Flag Coverage Δ *Carryforward flag
differential 9.29% <35.96%> (?)
total 15.34% <ø> (+<0.01%) ⬆️ Carriedforward from 3d40702

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

@satoshi-ota satoshi-ota self-requested a review December 14, 2023 06:09
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.

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 merged commit 1b6cc51 into autowarefoundation:main Dec 14, 2023
23 of 24 checks passed
danielsanchezaran pushed a commit to tier4/autoware.universe that referenced this pull request Dec 15, 2023
…owarefoundation#5850)

* refactor(lane_change): separate lane change and external request

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

* refactored external request lane change

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

* separate on external request

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

* style(pre-commit): autofix

* delete external request

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

* fix interface

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

* fix external lane change couldn't be initialize

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

* fix documents

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

* fix link in README

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

* fix based on comments

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

* add ament auto package

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

* Update planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* Update planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* fix test

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

* fix AbLC test

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>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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 Dec 19, 2023
…owarefoundation#5850)

* refactor(lane_change): separate lane change and external request

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

* refactored external request lane change

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

* separate on external request

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

* style(pre-commit): autofix

* delete external request

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

* fix interface

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

* fix external lane change couldn't be initialize

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

* fix documents

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

* fix link in README

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

* fix based on comments

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

* add ament auto package

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

* Update planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* Update planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* fix test

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

* fix AbLC test

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>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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 Dec 19, 2023
…owarefoundation#5850)

* refactor(lane_change): separate lane change and external request

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

* refactored external request lane change

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

* separate on external request

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

* style(pre-commit): autofix

* delete external request

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

* fix interface

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

* fix external lane change couldn't be initialize

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

* fix documents

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

* fix link in README

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

* fix based on comments

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

* add ament auto package

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

* Update planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* Update planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* fix test

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

* fix AbLC test

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>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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-separate-lane-change-package branch December 21, 2023 03:43
karishma1911 pushed a commit to Interplai/autoware.universe that referenced this pull request May 26, 2024
…owarefoundation#5850)

* refactor(lane_change): separate lane change and external request

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

* refactored external request lane change

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

* separate on external request

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

* style(pre-commit): autofix

* delete external request

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

* fix interface

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

* fix external lane change couldn't be initialize

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

* fix documents

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

* fix link in README

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

* fix based on comments

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

* add ament auto package

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

* Update planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* Update planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* fix test

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

* fix AbLC test

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>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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
…owarefoundation#5850)

* refactor(lane_change): separate lane change and external request

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

* refactored external request lane change

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

* separate on external request

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

* style(pre-commit): autofix

* delete external request

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

* fix interface

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

* fix external lane change couldn't be initialize

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

* fix documents

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

* fix link in README

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

* fix based on comments

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

* add ament auto package

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

* Update planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* Update planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* fix test

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

* fix AbLC test

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>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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
…owarefoundation#5850)

* refactor(lane_change): separate lane change and external request

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

* refactored external request lane change

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

* separate on external request

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

* style(pre-commit): autofix

* delete external request

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

* fix interface

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

* fix external lane change couldn't be initialize

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

* fix documents

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

* fix link in README

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

* fix based on comments

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

* add ament auto package

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

* Update planning/behavior_path_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* Update planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

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

* fix test

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

* fix AbLC test

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>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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) run:deploy-docs Mark for deploy-docs action generation. (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