From 0f21229c11686cb8c815119f8bd70a97aba5c212 Mon Sep 17 00:00:00 2001 From: "Y.Hisaki" Date: Mon, 10 Jun 2024 14:59:19 +0900 Subject: [PATCH 1/2] refactor(behavior_velocity_blind_spot_module): prefix package and namespace with autoware_ Signed-off-by: Y.Hisaki --- .github/CODEOWNERS | 2 +- planning/.pages | 2 +- .../CMakeLists.txt | 2 +- .../README.md | 0 .../config/blind_spot.param.yaml | 0 .../docs/blind-spot.drawio.svg | 0 .../docs/blind-spot.svg | 0 .../package.xml | 4 ++-- .../plugins.xml | 2 +- .../src/debug.cpp | 0 .../src/decisions.cpp | 0 .../src/manager.cpp | 0 .../src/manager.hpp | 1 + .../src/scene.cpp | 0 .../src/scene.hpp | 1 + planning/autoware_behavior_velocity_planner/README.md | 2 +- planning/autoware_behavior_velocity_planner/package.xml | 2 +- 17 files changed, 10 insertions(+), 8 deletions(-) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/CMakeLists.txt (86%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/README.md (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/config/blind_spot.param.yaml (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/docs/blind-spot.drawio.svg (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/docs/blind-spot.svg (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/package.xml (89%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/plugins.xml (71%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/src/debug.cpp (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/src/decisions.cpp (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/src/manager.cpp (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/src/manager.hpp (99%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/src/scene.cpp (100%) rename planning/{behavior_velocity_blind_spot_module => autoware_behavior_velocity_blind_spot_module}/src/scene.hpp (99%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9c64b64645c6f..8879781ed3538 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -171,7 +171,7 @@ planning/autoware_behavior_path_side_shift_module/** fumiya.watanabe@tier4.jp ky planning/autoware_behavior_path_start_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp planning/autoware_behavior_path_side_shift_module/** fumiya.watanabe@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp planning/behavior_path_start_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp -planning/behavior_velocity_blind_spot_module/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp +planning/autoware_behavior_velocity_blind_spot_module/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp planning/behavior_velocity_crosswalk_module/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp yuki.takagi@tier4.jp planning/behavior_velocity_detection_area_module/** kyoichi.sugahara@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp planning/behavior_velocity_dynamic_obstacle_stop_module/** mamoru.sobue@tier4.jp maxime.clement@tier4.jp diff --git a/planning/.pages b/planning/.pages index ce08c389c17f5..48267f0e4ce6c 100644 --- a/planning/.pages +++ b/planning/.pages @@ -21,7 +21,7 @@ nav: - 'About Behavior Velocity': planning/autoware_behavior_velocity_planner - 'Template for Custom Module': planning/autoware_behavior_velocity_template_module - 'Available Module': - - 'Blind Spot': planning/behavior_velocity_blind_spot_module + - 'Blind Spot': planning/autoware_behavior_velocity_blind_spot_module - 'Crosswalk': planning/behavior_velocity_crosswalk_module - 'Detection Area': planning/behavior_velocity_detection_area_module - 'Dynamic Obstacle Stop': planning/behavior_velocity_dynamic_obstacle_stop_module diff --git a/planning/behavior_velocity_blind_spot_module/CMakeLists.txt b/planning/autoware_behavior_velocity_blind_spot_module/CMakeLists.txt similarity index 86% rename from planning/behavior_velocity_blind_spot_module/CMakeLists.txt rename to planning/autoware_behavior_velocity_blind_spot_module/CMakeLists.txt index 7ff2419eed919..bdaa6d9f6aa2f 100644 --- a/planning/behavior_velocity_blind_spot_module/CMakeLists.txt +++ b/planning/autoware_behavior_velocity_blind_spot_module/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(behavior_velocity_blind_spot_module) +project(autoware_behavior_velocity_blind_spot_module) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/planning/behavior_velocity_blind_spot_module/README.md b/planning/autoware_behavior_velocity_blind_spot_module/README.md similarity index 100% rename from planning/behavior_velocity_blind_spot_module/README.md rename to planning/autoware_behavior_velocity_blind_spot_module/README.md diff --git a/planning/behavior_velocity_blind_spot_module/config/blind_spot.param.yaml b/planning/autoware_behavior_velocity_blind_spot_module/config/blind_spot.param.yaml similarity index 100% rename from planning/behavior_velocity_blind_spot_module/config/blind_spot.param.yaml rename to planning/autoware_behavior_velocity_blind_spot_module/config/blind_spot.param.yaml diff --git a/planning/behavior_velocity_blind_spot_module/docs/blind-spot.drawio.svg b/planning/autoware_behavior_velocity_blind_spot_module/docs/blind-spot.drawio.svg similarity index 100% rename from planning/behavior_velocity_blind_spot_module/docs/blind-spot.drawio.svg rename to planning/autoware_behavior_velocity_blind_spot_module/docs/blind-spot.drawio.svg diff --git a/planning/behavior_velocity_blind_spot_module/docs/blind-spot.svg b/planning/autoware_behavior_velocity_blind_spot_module/docs/blind-spot.svg similarity index 100% rename from planning/behavior_velocity_blind_spot_module/docs/blind-spot.svg rename to planning/autoware_behavior_velocity_blind_spot_module/docs/blind-spot.svg diff --git a/planning/behavior_velocity_blind_spot_module/package.xml b/planning/autoware_behavior_velocity_blind_spot_module/package.xml similarity index 89% rename from planning/behavior_velocity_blind_spot_module/package.xml rename to planning/autoware_behavior_velocity_blind_spot_module/package.xml index 67947398afb01..4cb554a4a1aab 100644 --- a/planning/behavior_velocity_blind_spot_module/package.xml +++ b/planning/autoware_behavior_velocity_blind_spot_module/package.xml @@ -1,9 +1,9 @@ - behavior_velocity_blind_spot_module + autoware_behavior_velocity_blind_spot_module 0.1.0 - The behavior_velocity_blind_spot_module package + The autoware_behavior_velocity_blind_spot_module package Mamoru Sobue Tomoya Kimura diff --git a/planning/behavior_velocity_blind_spot_module/plugins.xml b/planning/autoware_behavior_velocity_blind_spot_module/plugins.xml similarity index 71% rename from planning/behavior_velocity_blind_spot_module/plugins.xml rename to planning/autoware_behavior_velocity_blind_spot_module/plugins.xml index fb5019de5df08..4e490330246d8 100644 --- a/planning/behavior_velocity_blind_spot_module/plugins.xml +++ b/planning/autoware_behavior_velocity_blind_spot_module/plugins.xml @@ -1,3 +1,3 @@ - + diff --git a/planning/behavior_velocity_blind_spot_module/src/debug.cpp b/planning/autoware_behavior_velocity_blind_spot_module/src/debug.cpp similarity index 100% rename from planning/behavior_velocity_blind_spot_module/src/debug.cpp rename to planning/autoware_behavior_velocity_blind_spot_module/src/debug.cpp diff --git a/planning/behavior_velocity_blind_spot_module/src/decisions.cpp b/planning/autoware_behavior_velocity_blind_spot_module/src/decisions.cpp similarity index 100% rename from planning/behavior_velocity_blind_spot_module/src/decisions.cpp rename to planning/autoware_behavior_velocity_blind_spot_module/src/decisions.cpp diff --git a/planning/behavior_velocity_blind_spot_module/src/manager.cpp b/planning/autoware_behavior_velocity_blind_spot_module/src/manager.cpp similarity index 100% rename from planning/behavior_velocity_blind_spot_module/src/manager.cpp rename to planning/autoware_behavior_velocity_blind_spot_module/src/manager.cpp diff --git a/planning/behavior_velocity_blind_spot_module/src/manager.hpp b/planning/autoware_behavior_velocity_blind_spot_module/src/manager.hpp similarity index 99% rename from planning/behavior_velocity_blind_spot_module/src/manager.hpp rename to planning/autoware_behavior_velocity_blind_spot_module/src/manager.hpp index 12dccd846affc..756aec415c4ec 100644 --- a/planning/behavior_velocity_blind_spot_module/src/manager.hpp +++ b/planning/autoware_behavior_velocity_blind_spot_module/src/manager.hpp @@ -29,6 +29,7 @@ namespace autoware::behavior_velocity_planner { + class BlindSpotModuleManager : public SceneModuleManagerInterfaceWithRTC { public: diff --git a/planning/behavior_velocity_blind_spot_module/src/scene.cpp b/planning/autoware_behavior_velocity_blind_spot_module/src/scene.cpp similarity index 100% rename from planning/behavior_velocity_blind_spot_module/src/scene.cpp rename to planning/autoware_behavior_velocity_blind_spot_module/src/scene.cpp diff --git a/planning/behavior_velocity_blind_spot_module/src/scene.hpp b/planning/autoware_behavior_velocity_blind_spot_module/src/scene.hpp similarity index 99% rename from planning/behavior_velocity_blind_spot_module/src/scene.hpp rename to planning/autoware_behavior_velocity_blind_spot_module/src/scene.hpp index cfb6bfdfeeded..721576a9fac8a 100644 --- a/planning/behavior_velocity_blind_spot_module/src/scene.hpp +++ b/planning/autoware_behavior_velocity_blind_spot_module/src/scene.hpp @@ -36,6 +36,7 @@ namespace autoware::behavior_velocity_planner { + /** * @brief wrapper class of interpolated path with lane id */ diff --git a/planning/autoware_behavior_velocity_planner/README.md b/planning/autoware_behavior_velocity_planner/README.md index e792860239119..c09fa8105c25b 100644 --- a/planning/autoware_behavior_velocity_planner/README.md +++ b/planning/autoware_behavior_velocity_planner/README.md @@ -7,7 +7,7 @@ It loads modules as plugins. Please refer to the links listed below for detail o ![Architecture](./docs/BehaviorVelocityPlanner-Architecture.drawio.svg) -- [Blind Spot](../behavior_velocity_blind_spot_module/README.md) +- [Blind Spot](../autoware_behavior_velocity_blind_spot_module/README.md) - [Crosswalk](../behavior_velocity_crosswalk_module/README.md) - [Walkway](../autoware_behavior_velocity_walkway_module/README.md) - [Detection Area](../behavior_velocity_detection_area_module/README.md) diff --git a/planning/autoware_behavior_velocity_planner/package.xml b/planning/autoware_behavior_velocity_planner/package.xml index dcec42f80691f..7c66d6294a9e5 100644 --- a/planning/autoware_behavior_velocity_planner/package.xml +++ b/planning/autoware_behavior_velocity_planner/package.xml @@ -65,6 +65,7 @@ ament_cmake_ros ament_lint_auto + autoware_behavior_velocity_blind_spot_module autoware_behavior_velocity_intersection_module autoware_behavior_velocity_occlusion_spot_module autoware_behavior_velocity_run_out_module @@ -72,7 +73,6 @@ autoware_behavior_velocity_virtual_traffic_light_module autoware_behavior_velocity_walkway_module autoware_lint_common - behavior_velocity_blind_spot_module behavior_velocity_crosswalk_module behavior_velocity_detection_area_module behavior_velocity_no_drivable_lane_module From e9712a4a02260bd4108bcd0e8f0ef81e727892ed Mon Sep 17 00:00:00 2001 From: "Y.Hisaki" Date: Mon, 10 Jun 2024 14:59:19 +0900 Subject: [PATCH 2/2] modify test_node_interface to search blind_spot with prefix Signed-off-by: Y.Hisaki --- .../test/src/test_node_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp b/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp index 58e7a86e01302..cd8e9ca4bbfe8 100644 --- a/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp +++ b/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp @@ -95,7 +95,7 @@ std::shared_ptr generateNode() velocity_smoother_dir + "/config/default_velocity_smoother.param.yaml", velocity_smoother_dir + "/config/Analytical.param.yaml", behavior_velocity_planner_dir + "/config/behavior_velocity_planner.param.yaml", - get_behavior_velocity_module_config_no_prefix("blind_spot"), + get_behavior_velocity_module_config("blind_spot"), get_behavior_velocity_module_config_no_prefix("crosswalk"), get_behavior_velocity_module_config("walkway"), get_behavior_velocity_module_config_no_prefix("detection_area"),