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(behavior_path_planner): add new manager independent from behavior tree #2919

Merged

Conversation

satoshi-ota
Copy link
Contributor

@satoshi-ota satoshi-ota commented Feb 21, 2023

Description

⬇️ This must merge before this PR.
autowarefoundation/autoware_launch#218

In this PR, I add new manager that doesn't depend on behavior tree library. The manager is implemented based on the new architecture on this discussion.

NOTE

  • Conventional manager that based on BT library still remains, and that manager is activated by default.
  • Change manager in CMakelist.
  • The new manager is not compatible with the old one. We have to add the new scene modules that support new manager.
  • In this PR, there is no scene modules that support new manager. The new manager can only execute lane following.
  • The new scene modules will be added in the other PRs.

Related links

Tests performed

Evaluator

[TIER IV INTERNAL LINK] Baseline 811/814
[TIER IV INTERNAL LINK] This PR 812/814

Test by Psim

Please cherry-pick this commit to your autoware_launch or add following line to behavior_path_planner.param.yaml.

/**:
  ros__parameters:
    verbose: true # this line
   ...

If you want to use new manager, please set USE_BT to FALSE. For now, the manager can execute only lane following.

# use planner manager that supports behavior tree
set(USE_BT FALSE)
message(STATUS "USE_BEHAVIOR_TREE: " ${USE_BT})
simplescreenrecorder-2023-02-21_08.12.31.mp4

If you want to use conventional manager, please set USE_BT to TRUE.

# use planner manager that supports behavior tree
set(USE_BT TRUE)
message(STATUS "USE_BEHAVIOR_TREE: " ${USE_BT})
simplescreenrecorder-2023-02-21_09.24.17.mp4

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.

@github-actions github-actions bot added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Feb 21, 2023
@satoshi-ota satoshi-ota force-pushed the feat/add-new-framework branch 2 times, most recently from 0ff3482 to f6aed5c Compare February 21, 2023 06:30
@satoshi-ota satoshi-ota changed the title feat(behavior_path_planner): add new framework feat(behavior_path_planner): add new manager independent from behavior tree Feb 21, 2023
@satoshi-ota satoshi-ota force-pushed the feat/add-new-framework branch 2 times, most recently from 83ada32 to 8fe0ea6 Compare February 21, 2023 07:32
@satoshi-ota satoshi-ota marked this pull request as ready for review February 21, 2023 07:32
@codecov
Copy link

codecov bot commented Feb 22, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (ea58e59) 11.52% compared to head (e8708a0) 11.52%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2919      +/-   ##
==========================================
- Coverage   11.52%   11.52%   -0.01%     
==========================================
  Files        1314     1314              
  Lines       92819    92833      +14     
  Branches    25008    25018      +10     
==========================================
  Hits        10701    10701              
- Misses      70875    70888      +13     
- Partials    11243    11244       +1     
Flag Coverage Δ *Carryforward flag
differential 5.81% <0.00%> (?)
total 11.53% <ø> (+<0.01%) ⬆️ Carriedforward from ea58e59

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

Impacted Files Coverage Δ
...havior_path_planner/behavior_path_planner_node.hpp 0.00% <ø> (ø)
...ner/include/behavior_path_planner/data_manager.hpp 21.42% <ø> (ø)
...lanner/include/behavior_path_planner/utilities.hpp 23.80% <ø> (ø)
...or_path_planner/src/behavior_path_planner_node.cpp 0.15% <0.00%> (-0.01%) ⬇️
..._planner/src/scene_module/scene_module_visitor.cpp 0.00% <ø> (ø)
planning/behavior_path_planner/src/utilities.cpp 8.20% <0.00%> (-0.08%) ⬇️

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.

Copy link
Contributor

@rej55 rej55 left a comment

Choose a reason for hiding this comment

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

LGTM

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

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
satoshi-ota and others added 10 commits February 28, 2023 21:02
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>
Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>
Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>
@satoshi-ota
Copy link
Contributor Author

@rej55 @zulfaqar-azmi-t4 There is no critical regression.

[TIER IV INTERNAL LINK] Baseline 811/814
[TIER IV INTERNAL LINK] This PR 812/814

@satoshi-ota satoshi-ota merged commit f057084 into autowarefoundation:main Feb 28, 2023
@satoshi-ota satoshi-ota deleted the feat/add-new-framework branch February 28, 2023 22:07
nabetetsu pushed a commit to xygyo77/autoware.universe that referenced this pull request Mar 1, 2023
…r tree (autowarefoundation#2919)

* feat(data_manager): add member variable for new framework

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

* feat(utilities): add util function

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

* feat(behavior_path_planner): add framework that based on new architecture

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

* fix(behavior_path_planner): changeable framework by macro

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

* feat(behavior_path_planner): change framework in cmake

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

* fix(behavior_path_planner): fix cmake lint error

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

* fix(planner_manager): rename functions

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

* fix(planner_manager): not use ModuleID

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

* refactor(planner_manager): use lambda

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

* feat(planner_manager): reserve vector

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

* fix(behavior_path_planner): fix copyright

Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>

* fix(behavior_path_planner): fix copyright

Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>

* fix(behavior_path_planner): fix copyright

Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>
1222-takeshi pushed a commit to 1222-takeshi/autoware.universe that referenced this pull request Mar 6, 2023
…r tree (autowarefoundation#2919)

* feat(data_manager): add member variable for new framework

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

* feat(utilities): add util function

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

* feat(behavior_path_planner): add framework that based on new architecture

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

* fix(behavior_path_planner): changeable framework by macro

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

* feat(behavior_path_planner): change framework in cmake

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

* fix(behavior_path_planner): fix cmake lint error

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

* fix(planner_manager): rename functions

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

* fix(planner_manager): not use ModuleID

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

* refactor(planner_manager): use lambda

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

* feat(planner_manager): reserve vector

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

* fix(behavior_path_planner): fix copyright

Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>

* fix(behavior_path_planner): fix copyright

Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>

* fix(behavior_path_planner): fix copyright

Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@users.noreply.github.com>

---------

Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
Co-authored-by: Zulfaqar Azmi <93502286+zulfaqar-azmi-t4@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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants