renamed

Signed-off-by: Mamoru Sobue <[email protected]>
autowarefoundation · Jun 6, 2024 · 8c05b7a · 8c05b7a
1 parent d51bf13
commit 8c05b7a
Show file tree

Hide file tree

Showing 54 changed files with 12 additions and 12 deletions.
diff --git 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/...locity_intersection_module/CMakeLists.txt → ...locity_intersection_module/CMakeLists.txt b/...locity_intersection_module/CMakeLists.txt → ...locity_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/...or_velocity_intersection_module/README.md → ...or_velocity_intersection_module/README.md b/...or_velocity_intersection_module/README.md → ...or_velocity_intersection_module/README.md
diff --git a/...ion_module/config/intersection.param.yaml → ...ion_module/config/intersection.param.yaml b/...ion_module/config/intersection.param.yaml → ...ion_module/config/intersection.param.yaml
diff --git a/...ion_module/docs/data-structure.drawio.svg → ...ion_module/docs/data-structure.drawio.svg b/...ion_module/docs/data-structure.drawio.svg → ...ion_module/docs/data-structure.drawio.svg
diff --git a/...s/intersection-attention-ll-rr.drawio.svg → ...s/intersection-attention-ll-rr.drawio.svg b/...s/intersection-attention-ll-rr.drawio.svg → ...s/intersection-attention-ll-rr.drawio.svg
diff --git a/...s/intersection-attention-lr-rl.drawio.svg → ...s/intersection-attention-lr-rl.drawio.svg b/...s/intersection-attention-lr-rl.drawio.svg → ...s/intersection-attention-lr-rl.drawio.svg
diff --git a/...ntersection-attention-straight.drawio.svg → ...ntersection-attention-straight.drawio.svg b/...ntersection-attention-straight.drawio.svg → ...ntersection-attention-straight.drawio.svg
diff --git a/...le/docs/intersection-attention.drawio.svg → ...le/docs/intersection-attention.drawio.svg b/...le/docs/intersection-attention.drawio.svg → ...le/docs/intersection-attention.drawio.svg
diff --git a/...le/docs/intersection-stoplines.drawio.svg → ...le/docs/intersection-stoplines.drawio.svg b/...le/docs/intersection-stoplines.drawio.svg → ...le/docs/intersection-stoplines.drawio.svg
diff --git a/...ule/docs/intersection-topology.drawio.svg → ...ule/docs/intersection-topology.drawio.svg b/...ule/docs/intersection-topology.drawio.svg → ...ule/docs/intersection-topology.drawio.svg
diff --git a/...ection_module/docs/merge_from_private.png → ...ection_module/docs/merge_from_private.png b/...ection_module/docs/merge_from_private.png → ...ection_module/docs/merge_from_private.png
diff --git a/..._module/docs/occlusion-with-tl.drawio.svg → ..._module/docs/occlusion-with-tl.drawio.svg b/..._module/docs/occlusion-with-tl.drawio.svg → ..._module/docs/occlusion-with-tl.drawio.svg
diff --git a/...dule/docs/occlusion-without-tl.drawio.svg → ...dule/docs/occlusion-without-tl.drawio.svg b/...dule/docs/occlusion-without-tl.drawio.svg → ...dule/docs/occlusion-without-tl.drawio.svg
diff --git a/..._module/docs/occlusion-wo-tl-creeping.png → ..._module/docs/occlusion-wo-tl-creeping.png b/..._module/docs/occlusion-wo-tl-creeping.png → ..._module/docs/occlusion-wo-tl-creeping.png
diff --git a/...ion_module/docs/occlusion_grid.drawio.svg → ...ion_module/docs/occlusion_grid.drawio.svg b/...ion_module/docs/occlusion_grid.drawio.svg → ...ion_module/docs/occlusion_grid.drawio.svg
diff --git a/...on_module/docs/pass-judge-line.drawio.svg → ...on_module/docs/pass-judge-line.drawio.svg b/...on_module/docs/pass-judge-line.drawio.svg → ...on_module/docs/pass-judge-line.drawio.svg
diff --git a/...module/docs/signal-phase-group.drawio.svg → ...module/docs/signal-phase-group.drawio.svg b/...module/docs/signal-phase-group.drawio.svg → ...module/docs/signal-phase-group.drawio.svg
diff --git a/..._module/docs/static-occlusion-timeout.png → ..._module/docs/static-occlusion-timeout.png b/..._module/docs/static-occlusion-timeout.png → ..._module/docs/static-occlusion-timeout.png
diff --git a/...tion_module/docs/stuck-vehicle.drawio.svg → ...tion_module/docs/stuck-vehicle.drawio.svg b/...tion_module/docs/stuck-vehicle.drawio.svg → ...tion_module/docs/stuck-vehicle.drawio.svg
diff --git a/...raffic-light-specific-behavior.drawio.svg → ...raffic-light-specific-behavior.drawio.svg b/...raffic-light-specific-behavior.drawio.svg → ...raffic-light-specific-behavior.drawio.svg
diff --git a/...velocity_intersection_module/docs/ttc.gif → ...velocity_intersection_module/docs/ttc.gif b/...velocity_intersection_module/docs/ttc.gif → ...velocity_intersection_module/docs/ttc.gif
diff --git a/..._module/docs/ugly-intersection.drawio.svg → ..._module/docs/ugly-intersection.drawio.svg b/..._module/docs/ugly-intersection.drawio.svg → ..._module/docs/ugly-intersection.drawio.svg
diff --git a/..._module/docs/upstream-velocity.drawio.svg → ..._module/docs/upstream-velocity.drawio.svg b/..._module/docs/upstream-velocity.drawio.svg → ..._module/docs/upstream-velocity.drawio.svg
diff --git a/...ection_module/docs/yield-stuck.drawio.svg → ...ection_module/docs/yield-stuck.drawio.svg b/...ection_module/docs/yield-stuck.drawio.svg → ...ection_module/docs/yield-stuck.drawio.svg
diff --git a/..._velocity_intersection_module/package.xml → ..._velocity_intersection_module/package.xml b/..._velocity_intersection_module/package.xml → ..._velocity_intersection_module/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>behavior_velocity_intersection_module</name>
+  <name>autoware_behavior_velocity_intersection_module</name>
   <version>0.1.0</version>
-  <description>The behavior_velocity_intersection_module package</description>
+  <description>The autoware_behavior_velocity_intersection_module package</description>
 
   <maintainer email="[email protected]">Mamoru Sobue</maintainer>
   <maintainer email="[email protected]">Takayuki Murooka</maintainer>

diff --git a/planning/autoware_behavior_velocity_intersection_module/plugins.xml b/planning/autoware_behavior_velocity_intersection_module/plugins.xml
@@ -0,0 +1,4 @@
+<library path="autoware_behavior_velocity_intersection_module">
+  <class type="autoware::behavior_velocity_planner::IntersectionModulePlugin" base_class_type="autoware::behavior_velocity_planner::PluginInterface"/>
+  <class type="autoware::behavior_velocity_planner::MergeFromPrivateModulePlugin" base_class_type="autoware::behavior_velocity_planner::PluginInterface"/>
+</library>
diff --git a/...locity_intersection_module/scripts/ttc.py → ...locity_intersection_module/scripts/ttc.py b/...locity_intersection_module/scripts/ttc.py → ...locity_intersection_module/scripts/ttc.py
diff --git a/...elocity_intersection_module/src/debug.cpp → ...elocity_intersection_module/src/debug.cpp b/...elocity_intersection_module/src/debug.cpp → ...elocity_intersection_module/src/debug.cpp
diff --git a/...tersection_module/src/decision_result.cpp → ...tersection_module/src/decision_result.cpp b/...tersection_module/src/decision_result.cpp → ...tersection_module/src/decision_result.cpp
diff --git a/...tersection_module/src/decision_result.hpp → ...tersection_module/src/decision_result.hpp b/...tersection_module/src/decision_result.hpp → ...tersection_module/src/decision_result.hpp
diff --git a/...ion_module/src/interpolated_path_info.hpp → ...ion_module/src/interpolated_path_info.hpp b/...ion_module/src/interpolated_path_info.hpp → ...ion_module/src/interpolated_path_info.hpp
diff --git a/...tion_module/src/intersection_lanelets.cpp → ...tion_module/src/intersection_lanelets.cpp b/...tion_module/src/intersection_lanelets.cpp → ...tion_module/src/intersection_lanelets.cpp
diff --git a/...tion_module/src/intersection_lanelets.hpp → ...tion_module/src/intersection_lanelets.hpp b/...tion_module/src/intersection_lanelets.hpp → ...tion_module/src/intersection_lanelets.hpp
diff --git a/...ion_module/src/intersection_stoplines.hpp → ...ion_module/src/intersection_stoplines.hpp b/...ion_module/src/intersection_stoplines.hpp → ...ion_module/src/intersection_stoplines.hpp
diff --git a/...ocity_intersection_module/src/manager.cpp → ...ocity_intersection_module/src/manager.cpp b/...ocity_intersection_module/src/manager.cpp → ...ocity_intersection_module/src/manager.cpp
diff --git a/...ocity_intersection_module/src/manager.hpp → ...ocity_intersection_module/src/manager.hpp b/...ocity_intersection_module/src/manager.hpp → ...ocity_intersection_module/src/manager.hpp
diff --git a/...ntersection_module/src/object_manager.cpp → ...ntersection_module/src/object_manager.cpp b/...ntersection_module/src/object_manager.cpp → ...ntersection_module/src/object_manager.cpp
diff --git a/...ntersection_module/src/object_manager.hpp → ...ntersection_module/src/object_manager.hpp b/...ntersection_module/src/object_manager.hpp → ...ntersection_module/src/object_manager.hpp
diff --git a/...locity_intersection_module/src/result.hpp → ...locity_intersection_module/src/result.hpp b/...locity_intersection_module/src/result.hpp → ...locity_intersection_module/src/result.hpp
diff --git a/...section_module/src/scene_intersection.cpp → ...section_module/src/scene_intersection.cpp b/...section_module/src/scene_intersection.cpp → ...section_module/src/scene_intersection.cpp
diff --git a/...section_module/src/scene_intersection.hpp → ...section_module/src/scene_intersection.hpp b/...section_module/src/scene_intersection.hpp → ...section_module/src/scene_intersection.hpp
diff --git a/...dule/src/scene_intersection_collision.cpp → ...dule/src/scene_intersection_collision.cpp b/...dule/src/scene_intersection_collision.cpp → ...dule/src/scene_intersection_collision.cpp
diff --git a/...dule/src/scene_intersection_occlusion.cpp → ...dule/src/scene_intersection_occlusion.cpp b/...dule/src/scene_intersection_occlusion.cpp → ...dule/src/scene_intersection_occlusion.cpp
diff --git a/...e/src/scene_intersection_prepare_data.cpp → ...e/src/scene_intersection_prepare_data.cpp b/...e/src/scene_intersection_prepare_data.cpp → ...e/src/scene_intersection_prepare_data.cpp
diff --git a/...n_module/src/scene_intersection_stuck.cpp → ...n_module/src/scene_intersection_stuck.cpp b/...n_module/src/scene_intersection_stuck.cpp → ...n_module/src/scene_intersection_stuck.cpp
diff --git a/...ule/src/scene_merge_from_private_road.cpp → ...ule/src/scene_merge_from_private_road.cpp b/...ule/src/scene_merge_from_private_road.cpp → ...ule/src/scene_merge_from_private_road.cpp
diff --git a/...ule/src/scene_merge_from_private_road.hpp → ...ule/src/scene_merge_from_private_road.hpp b/...ule/src/scene_merge_from_private_road.hpp → ...ule/src/scene_merge_from_private_road.hpp
diff --git a/...velocity_intersection_module/src/util.cpp → ...velocity_intersection_module/src/util.cpp b/...velocity_intersection_module/src/util.cpp → ...velocity_intersection_module/src/util.cpp
diff --git a/...velocity_intersection_module/src/util.hpp → ...velocity_intersection_module/src/util.hpp b/...velocity_intersection_module/src/util.hpp → ...velocity_intersection_module/src/util.hpp
diff --git 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
@@ -65,12 +65,12 @@
 
   <test_depend>ament_cmake_ros</test_depend>
   <test_depend>ament_lint_auto</test_depend>
+  <test_depend>autoware_behavior_velocity_intersection_module</test_depend>
   <test_depend>autoware_behavior_velocity_virtual_traffic_light_module</test_depend>
   <test_depend>autoware_lint_common</test_depend>
   <test_depend>behavior_velocity_blind_spot_module</test_depend>
   <test_depend>behavior_velocity_crosswalk_module</test_depend>
   <test_depend>behavior_velocity_detection_area_module</test_depend>
-  <test_depend>behavior_velocity_intersection_module</test_depend>
   <test_depend>behavior_velocity_no_drivable_lane_module</test_depend>
   <test_depend>behavior_velocity_no_stopping_area_module</test_depend>
   <test_depend>behavior_velocity_occlusion_spot_module</test_depend>

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
@@ -71,7 +71,7 @@ std::shared_ptr<BehaviorVelocityPlannerNode> 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<BehaviorVelocityPlannerNode> 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_no_prefix("run_out"),

diff --git a/planning/behavior_velocity_intersection_module/plugins.xml b/planning/behavior_velocity_intersection_module/plugins.xml