From a731a21af6ba13a25c4a5676a193740ae4e846ba Mon Sep 17 00:00:00 2001 From: Mamoru Sobue Date: Thu, 6 Jun 2024 16:30:19 +0900 Subject: [PATCH] renamed Signed-off-by: Mamoru Sobue --- planning/.pages | 2 +- .../CMakeLists.txt | 2 +- .../README.md | 0 .../config/intersection.param.yaml | 0 .../docs/data-structure.drawio.svg | 0 .../docs/intersection-attention-ll-rr.drawio.svg | 0 .../docs/intersection-attention-lr-rl.drawio.svg | 0 .../docs/intersection-attention-straight.drawio.svg | 0 .../docs/intersection-attention.drawio.svg | 0 .../docs/intersection-stoplines.drawio.svg | 0 .../docs/intersection-topology.drawio.svg | 0 .../docs/merge_from_private.png | Bin .../docs/occlusion-with-tl.drawio.svg | 0 .../docs/occlusion-without-tl.drawio.svg | 0 .../docs/occlusion-wo-tl-creeping.png | Bin .../docs/occlusion_grid.drawio.svg | 0 .../docs/pass-judge-line.drawio.svg | 0 .../docs/signal-phase-group.drawio.svg | 0 .../docs/static-occlusion-timeout.png | Bin .../docs/stuck-vehicle.drawio.svg | 0 .../docs/traffic-light-specific-behavior.drawio.svg | 0 .../docs/ttc.gif | Bin .../docs/ugly-intersection.drawio.svg | 0 .../docs/upstream-velocity.drawio.svg | 0 .../docs/yield-stuck.drawio.svg | 0 .../package.xml | 4 ++-- .../plugins.xml | 4 ++++ .../scripts/ttc.py | 0 .../src/debug.cpp | 0 .../src/decision_result.cpp | 0 .../src/decision_result.hpp | 0 .../src/interpolated_path_info.hpp | 0 .../src/intersection_lanelets.cpp | 0 .../src/intersection_lanelets.hpp | 0 .../src/intersection_stoplines.hpp | 0 .../src/manager.cpp | 0 .../src/manager.hpp | 0 .../src/object_manager.cpp | 0 .../src/object_manager.hpp | 0 .../src/result.hpp | 0 .../src/scene_intersection.cpp | 0 .../src/scene_intersection.hpp | 0 .../src/scene_intersection_collision.cpp | 0 .../src/scene_intersection_occlusion.cpp | 0 .../src/scene_intersection_prepare_data.cpp | 0 .../src/scene_intersection_stuck.cpp | 0 .../src/scene_merge_from_private_road.cpp | 0 .../src/scene_merge_from_private_road.hpp | 0 .../src/util.cpp | 0 .../src/util.hpp | 0 .../autoware_behavior_velocity_planner/README.md | 2 +- .../autoware_behavior_velocity_planner/package.xml | 2 +- .../test/src/test_node_interface.cpp | 4 ++-- .../plugins.xml | 4 ---- 54 files changed, 12 insertions(+), 12 deletions(-) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/CMakeLists.txt (93%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/README.md (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/config/intersection.param.yaml (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/data-structure.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/intersection-attention-ll-rr.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/intersection-attention-lr-rl.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/intersection-attention-straight.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/intersection-attention.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/intersection-stoplines.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/intersection-topology.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/merge_from_private.png (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/occlusion-with-tl.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/occlusion-without-tl.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/occlusion-wo-tl-creeping.png (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/occlusion_grid.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/pass-judge-line.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/signal-phase-group.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/static-occlusion-timeout.png (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/stuck-vehicle.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/traffic-light-specific-behavior.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/ttc.gif (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/ugly-intersection.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/upstream-velocity.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/docs/yield-stuck.drawio.svg (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/package.xml (91%) create mode 100644 planning/autoware_behavior_velocity_intersection_module/plugins.xml rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/scripts/ttc.py (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/debug.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/decision_result.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/decision_result.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/interpolated_path_info.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/intersection_lanelets.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/intersection_lanelets.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/intersection_stoplines.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/manager.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/manager.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/object_manager.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/object_manager.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/result.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_intersection.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_intersection.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_intersection_collision.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_intersection_occlusion.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_intersection_prepare_data.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_intersection_stuck.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_merge_from_private_road.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/scene_merge_from_private_road.hpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/util.cpp (100%) rename planning/{behavior_velocity_intersection_module => autoware_behavior_velocity_intersection_module}/src/util.hpp (100%) delete mode 100644 planning/behavior_velocity_intersection_module/plugins.xml diff --git a/planning/.pages b/planning/.pages index 48dc8f32edf71..f3dc3f7f71016 100644 --- a/planning/.pages +++ b/planning/.pages @@ -25,7 +25,7 @@ nav: - 'Crosswalk': planning/behavior_velocity_crosswalk_module - 'Detection Area': planning/behavior_velocity_detection_area_module - 'Dynamic Obstacle Stop': planning/behavior_velocity_dynamic_obstacle_stop_module - - 'Intersection': planning/behavior_velocity_intersection_module + - 'Intersection': planning/autoware_behavior_velocity_intersection_module - 'No Drivable Lane': planning/behavior_velocity_no_drivable_lane_module - 'No Stopping Area': planning/behavior_velocity_no_stopping_area_module - 'Occlusion Spot': planning/behavior_velocity_occlusion_spot_module diff --git a/planning/behavior_velocity_intersection_module/CMakeLists.txt b/planning/autoware_behavior_velocity_intersection_module/CMakeLists.txt similarity index 93% rename from planning/behavior_velocity_intersection_module/CMakeLists.txt rename to planning/autoware_behavior_velocity_intersection_module/CMakeLists.txt index c02b5a3852722..f3b31001978e9 100644 --- a/planning/behavior_velocity_intersection_module/CMakeLists.txt +++ b/planning/autoware_behavior_velocity_intersection_module/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(behavior_velocity_intersection_module) +project(autoware_behavior_velocity_intersection_module) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/planning/behavior_velocity_intersection_module/README.md b/planning/autoware_behavior_velocity_intersection_module/README.md similarity index 100% rename from planning/behavior_velocity_intersection_module/README.md rename to planning/autoware_behavior_velocity_intersection_module/README.md diff --git a/planning/behavior_velocity_intersection_module/config/intersection.param.yaml b/planning/autoware_behavior_velocity_intersection_module/config/intersection.param.yaml similarity index 100% rename from planning/behavior_velocity_intersection_module/config/intersection.param.yaml rename to planning/autoware_behavior_velocity_intersection_module/config/intersection.param.yaml diff --git a/planning/behavior_velocity_intersection_module/docs/data-structure.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/data-structure.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/data-structure.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/data-structure.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/intersection-attention-ll-rr.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention-ll-rr.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/intersection-attention-ll-rr.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention-ll-rr.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/intersection-attention-lr-rl.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention-lr-rl.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/intersection-attention-lr-rl.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention-lr-rl.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/intersection-attention-straight.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention-straight.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/intersection-attention-straight.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention-straight.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/intersection-attention.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/intersection-attention.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/intersection-attention.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/intersection-stoplines.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/intersection-stoplines.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/intersection-stoplines.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/intersection-stoplines.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/intersection-topology.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/intersection-topology.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/intersection-topology.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/intersection-topology.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/merge_from_private.png b/planning/autoware_behavior_velocity_intersection_module/docs/merge_from_private.png similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/merge_from_private.png rename to planning/autoware_behavior_velocity_intersection_module/docs/merge_from_private.png diff --git a/planning/behavior_velocity_intersection_module/docs/occlusion-with-tl.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/occlusion-with-tl.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/occlusion-with-tl.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/occlusion-with-tl.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/occlusion-without-tl.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/occlusion-without-tl.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/occlusion-without-tl.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/occlusion-without-tl.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/occlusion-wo-tl-creeping.png b/planning/autoware_behavior_velocity_intersection_module/docs/occlusion-wo-tl-creeping.png similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/occlusion-wo-tl-creeping.png rename to planning/autoware_behavior_velocity_intersection_module/docs/occlusion-wo-tl-creeping.png diff --git a/planning/behavior_velocity_intersection_module/docs/occlusion_grid.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/occlusion_grid.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/occlusion_grid.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/occlusion_grid.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/pass-judge-line.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/pass-judge-line.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/pass-judge-line.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/pass-judge-line.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/signal-phase-group.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/signal-phase-group.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/signal-phase-group.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/signal-phase-group.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/static-occlusion-timeout.png b/planning/autoware_behavior_velocity_intersection_module/docs/static-occlusion-timeout.png similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/static-occlusion-timeout.png rename to planning/autoware_behavior_velocity_intersection_module/docs/static-occlusion-timeout.png diff --git a/planning/behavior_velocity_intersection_module/docs/stuck-vehicle.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/stuck-vehicle.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/stuck-vehicle.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/stuck-vehicle.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/traffic-light-specific-behavior.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/traffic-light-specific-behavior.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/traffic-light-specific-behavior.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/traffic-light-specific-behavior.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/ttc.gif b/planning/autoware_behavior_velocity_intersection_module/docs/ttc.gif similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/ttc.gif rename to planning/autoware_behavior_velocity_intersection_module/docs/ttc.gif diff --git a/planning/behavior_velocity_intersection_module/docs/ugly-intersection.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/ugly-intersection.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/ugly-intersection.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/ugly-intersection.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/upstream-velocity.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/upstream-velocity.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/upstream-velocity.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/upstream-velocity.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/docs/yield-stuck.drawio.svg b/planning/autoware_behavior_velocity_intersection_module/docs/yield-stuck.drawio.svg similarity index 100% rename from planning/behavior_velocity_intersection_module/docs/yield-stuck.drawio.svg rename to planning/autoware_behavior_velocity_intersection_module/docs/yield-stuck.drawio.svg diff --git a/planning/behavior_velocity_intersection_module/package.xml b/planning/autoware_behavior_velocity_intersection_module/package.xml similarity index 91% rename from planning/behavior_velocity_intersection_module/package.xml rename to planning/autoware_behavior_velocity_intersection_module/package.xml index 3694a395b3a53..204a267594c03 100644 --- a/planning/behavior_velocity_intersection_module/package.xml +++ b/planning/autoware_behavior_velocity_intersection_module/package.xml @@ -1,9 +1,9 @@ - behavior_velocity_intersection_module + autoware_behavior_velocity_intersection_module 0.1.0 - The behavior_velocity_intersection_module package + The autoware_behavior_velocity_intersection_module package Mamoru Sobue Takayuki Murooka diff --git a/planning/autoware_behavior_velocity_intersection_module/plugins.xml b/planning/autoware_behavior_velocity_intersection_module/plugins.xml new file mode 100644 index 0000000000000..d30fbb46e050e --- /dev/null +++ b/planning/autoware_behavior_velocity_intersection_module/plugins.xml @@ -0,0 +1,4 @@ + + + + diff --git a/planning/behavior_velocity_intersection_module/scripts/ttc.py b/planning/autoware_behavior_velocity_intersection_module/scripts/ttc.py similarity index 100% rename from planning/behavior_velocity_intersection_module/scripts/ttc.py rename to planning/autoware_behavior_velocity_intersection_module/scripts/ttc.py diff --git a/planning/behavior_velocity_intersection_module/src/debug.cpp b/planning/autoware_behavior_velocity_intersection_module/src/debug.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/debug.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/debug.cpp diff --git a/planning/behavior_velocity_intersection_module/src/decision_result.cpp b/planning/autoware_behavior_velocity_intersection_module/src/decision_result.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/decision_result.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/decision_result.cpp diff --git a/planning/behavior_velocity_intersection_module/src/decision_result.hpp b/planning/autoware_behavior_velocity_intersection_module/src/decision_result.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/decision_result.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/decision_result.hpp diff --git a/planning/behavior_velocity_intersection_module/src/interpolated_path_info.hpp b/planning/autoware_behavior_velocity_intersection_module/src/interpolated_path_info.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/interpolated_path_info.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/interpolated_path_info.hpp diff --git a/planning/behavior_velocity_intersection_module/src/intersection_lanelets.cpp b/planning/autoware_behavior_velocity_intersection_module/src/intersection_lanelets.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/intersection_lanelets.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/intersection_lanelets.cpp diff --git a/planning/behavior_velocity_intersection_module/src/intersection_lanelets.hpp b/planning/autoware_behavior_velocity_intersection_module/src/intersection_lanelets.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/intersection_lanelets.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/intersection_lanelets.hpp diff --git a/planning/behavior_velocity_intersection_module/src/intersection_stoplines.hpp b/planning/autoware_behavior_velocity_intersection_module/src/intersection_stoplines.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/intersection_stoplines.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/intersection_stoplines.hpp diff --git a/planning/behavior_velocity_intersection_module/src/manager.cpp b/planning/autoware_behavior_velocity_intersection_module/src/manager.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/manager.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/manager.cpp diff --git a/planning/behavior_velocity_intersection_module/src/manager.hpp b/planning/autoware_behavior_velocity_intersection_module/src/manager.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/manager.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/manager.hpp diff --git a/planning/behavior_velocity_intersection_module/src/object_manager.cpp b/planning/autoware_behavior_velocity_intersection_module/src/object_manager.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/object_manager.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/object_manager.cpp diff --git a/planning/behavior_velocity_intersection_module/src/object_manager.hpp b/planning/autoware_behavior_velocity_intersection_module/src/object_manager.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/object_manager.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/object_manager.hpp diff --git a/planning/behavior_velocity_intersection_module/src/result.hpp b/planning/autoware_behavior_velocity_intersection_module/src/result.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/result.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/result.hpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_intersection.cpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_intersection.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_intersection.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_intersection.cpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_intersection.hpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_intersection.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_intersection.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_intersection.hpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_intersection_collision.cpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_collision.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_intersection_collision.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_collision.cpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_intersection_occlusion.cpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_occlusion.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_intersection_occlusion.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_occlusion.cpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_intersection_prepare_data.cpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_prepare_data.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_intersection_prepare_data.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_prepare_data.cpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_intersection_stuck.cpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_stuck.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_intersection_stuck.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_intersection_stuck.cpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_merge_from_private_road.cpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_merge_from_private_road.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_merge_from_private_road.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_merge_from_private_road.cpp diff --git a/planning/behavior_velocity_intersection_module/src/scene_merge_from_private_road.hpp b/planning/autoware_behavior_velocity_intersection_module/src/scene_merge_from_private_road.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/scene_merge_from_private_road.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/scene_merge_from_private_road.hpp diff --git a/planning/behavior_velocity_intersection_module/src/util.cpp b/planning/autoware_behavior_velocity_intersection_module/src/util.cpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/util.cpp rename to planning/autoware_behavior_velocity_intersection_module/src/util.cpp diff --git a/planning/behavior_velocity_intersection_module/src/util.hpp b/planning/autoware_behavior_velocity_intersection_module/src/util.hpp similarity index 100% rename from planning/behavior_velocity_intersection_module/src/util.hpp rename to planning/autoware_behavior_velocity_intersection_module/src/util.hpp diff --git a/planning/autoware_behavior_velocity_planner/README.md b/planning/autoware_behavior_velocity_planner/README.md index bcef46e90c1ec..ce45f874bac7a 100644 --- a/planning/autoware_behavior_velocity_planner/README.md +++ b/planning/autoware_behavior_velocity_planner/README.md @@ -11,7 +11,7 @@ It loads modules as plugins. Please refer to the links listed below for detail o - [Crosswalk](../behavior_velocity_crosswalk_module/README.md) - [Walkway](../behavior_velocity_walkway_module/README.md) - [Detection Area](../behavior_velocity_detection_area_module/README.md) -- [Intersection](../behavior_velocity_intersection_module/README.md) +- [Intersection](../autoware_behavior_velocity_intersection_module/README.md) - [MergeFromPrivate](../behavior_velocity_intersection_module/README.md#merge-from-private) - [Stop Line](../behavior_velocity_stop_line_module/README.md) - [Virtual Traffic Light](../autoware_behavior_velocity_virtual_traffic_light_module/README.md) diff --git a/planning/autoware_behavior_velocity_planner/package.xml b/planning/autoware_behavior_velocity_planner/package.xml index fff1fb8ff91c0..eddc4e24ed0b3 100644 --- a/planning/autoware_behavior_velocity_planner/package.xml +++ b/planning/autoware_behavior_velocity_planner/package.xml @@ -66,12 +66,12 @@ ament_cmake_ros ament_lint_auto autoware_behavior_velocity_run_out_module + autoware_behavior_velocity_intersection_module autoware_behavior_velocity_virtual_traffic_light_module autoware_lint_common behavior_velocity_blind_spot_module behavior_velocity_crosswalk_module behavior_velocity_detection_area_module - behavior_velocity_intersection_module behavior_velocity_no_drivable_lane_module behavior_velocity_no_stopping_area_module behavior_velocity_occlusion_spot_module 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 e741d054afbaf..cdfdd4f55e25f 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 @@ -71,7 +71,7 @@ std::shared_ptr generateNode() module_names.emplace_back("behavior_velocity_planner::CrosswalkModulePlugin"); module_names.emplace_back("behavior_velocity_planner::WalkwayModulePlugin"); module_names.emplace_back("behavior_velocity_planner::TrafficLightModulePlugin"); - module_names.emplace_back("behavior_velocity_planner::IntersectionModulePlugin"); + module_names.emplace_back("autoware::behavior_velocity_planner::IntersectionModulePlugin"); module_names.emplace_back("behavior_velocity_planner::MergeFromPrivateModulePlugin"); module_names.emplace_back("behavior_velocity_planner::BlindSpotModulePlugin"); module_names.emplace_back("behavior_velocity_planner::DetectionAreaModulePlugin"); @@ -100,7 +100,7 @@ std::shared_ptr generateNode() get_behavior_velocity_module_config_no_prefix("crosswalk"), get_behavior_velocity_module_config_no_prefix("walkway"), get_behavior_velocity_module_config_no_prefix("detection_area"), - get_behavior_velocity_module_config_no_prefix("intersection"), + get_behavior_velocity_module_config("intersection"), get_behavior_velocity_module_config_no_prefix("no_stopping_area"), get_behavior_velocity_module_config_no_prefix("occlusion_spot"), get_behavior_velocity_module_config("run_out"), diff --git a/planning/behavior_velocity_intersection_module/plugins.xml b/planning/behavior_velocity_intersection_module/plugins.xml deleted file mode 100644 index 206f0324231ec..0000000000000 --- a/planning/behavior_velocity_intersection_module/plugins.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -