build(behavior_path_avoidance_by_lane_change_module): prefix package …

…and namespace with autoware_ Signed-off-by: Esteve Fernandez <[email protected]>
autowarefoundation · Apr 2, 2024 · 2daaf8f · 2daaf8f
1 parent 5617f74
commit 2daaf8f
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 8 deletions.
diff --git a/planning/behavior_path_avoidance_by_lane_change_module/CMakeLists.txt b/planning/behavior_path_avoidance_by_lane_change_module/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(behavior_path_avoidance_by_lane_change_module)
+project(autoware_behavior_path_avoidance_by_lane_change_module)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()

diff --git a/...lane_change_module/include/behavior_path_avoidance_by_lane_change_module/data_structs.hpp b/...lane_change_module/include/behavior_path_avoidance_by_lane_change_module/data_structs.hpp
@@ -16,6 +16,8 @@
 
 #include "behavior_path_avoidance_module/data_structs.hpp"
 
+namespace autoware
+{
 namespace behavior_path_planner
 {
 struct AvoidanceByLCParameters : public AvoidanceParameters
@@ -31,5 +33,6 @@ struct AvoidanceByLCParameters : public AvoidanceParameters
   }
 };
 }  // namespace behavior_path_planner
+}  // namespace autoware
 
 #endif  // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_
diff --git a/...by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/interface.hpp b/...by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/interface.hpp
@@ -25,6 +25,8 @@
 #include <string>
 #include <unordered_map>
 
+namespace autoware
+{
 namespace behavior_path_planner
 {
 class AvoidanceByLaneChangeInterface : public LaneChangeInterface
@@ -46,5 +48,6 @@ class AvoidanceByLaneChangeInterface : public LaneChangeInterface
   void updateRTCStatus(const double start_distance, const double finish_distance) override;
 };
 }  // namespace behavior_path_planner
+}  // namespace autoware
 
 #endif  // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_
diff --git a/...e_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/manager.hpp b/...e_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/manager.hpp
@@ -26,6 +26,8 @@
 #include <unordered_map>
 #include <vector>
 
+namespace autoware
+{
 namespace behavior_path_planner
 {
 using route_handler::Direction;
@@ -48,5 +50,6 @@ class AvoidanceByLaneChangeModuleManager : public LaneChangeModuleManager
   std::shared_ptr<AvoidanceByLCParameters> avoidance_parameters_;
 };
 }  // namespace behavior_path_planner
+}  // namespace autoware
 
 #endif  // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_
diff --git a/...nce_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/scene.hpp b/...nce_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/scene.hpp
@@ -21,6 +21,8 @@
 
 #include <memory>
 
+namespace autoware
+{
 namespace behavior_path_planner
 {
 using AvoidanceDebugData = DebugData;
@@ -60,5 +62,6 @@ class AvoidanceByLaneChange : public NormalLaneChange
   double calcLateralOffset() const;
 };
 }  // namespace behavior_path_planner
+}  // namespace autoware
 
 #endif  // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_
diff --git a/planning/behavior_path_avoidance_by_lane_change_module/package.xml b/planning/behavior_path_avoidance_by_lane_change_module/package.xml
@@ -1,7 +1,7 @@
 <?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_path_avoidance_by_lane_change_module</name>
+  <name>autoware_behavior_path_avoidance_by_lane_change_module</name>
   <version>0.1.0</version>
   <description>The behavior_path_avoidance_by_lane_change_module package</description>
 

diff --git a/planning/behavior_path_avoidance_by_lane_change_module/plugins.xml b/planning/behavior_path_avoidance_by_lane_change_module/plugins.xml
@@ -1,3 +1,3 @@
 <library path="behavior_path_avoidance_by_lane_change_module">
-  <class type="behavior_path_planner::AvoidanceByLaneChangeModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
+  <class type="autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager" base_class_type="autoware::behavior_path_planner::SceneModuleManagerInterface"/>
 </library>
diff --git a/planning/behavior_path_avoidance_by_lane_change_module/src/interface.cpp b/planning/behavior_path_avoidance_by_lane_change_module/src/interface.cpp
@@ -20,6 +20,8 @@
 #include <memory>
 #include <string>
 
+namespace autoware
+{
 namespace behavior_path_planner
 {
 AvoidanceByLaneChangeInterface::AvoidanceByLaneChangeInterface(
@@ -61,3 +63,4 @@ void AvoidanceByLaneChangeInterface::updateRTCStatus(
     uuid_map_.at(direction), isExecutionReady(), start_distance, finish_distance, clock_->now());
 }
 }  // namespace behavior_path_planner
+}  // namespace autoware
diff --git a/planning/behavior_path_avoidance_by_lane_change_module/src/manager.cpp b/planning/behavior_path_avoidance_by_lane_change_module/src/manager.cpp
@@ -25,6 +25,8 @@
 #include <string>
 #include <vector>
 
+namespace autoware
+{
 namespace behavior_path_planner
 {
 
@@ -190,8 +192,9 @@ AvoidanceByLaneChangeModuleManager::createNewSceneModuleInstance()
 }
 
 }  // namespace behavior_path_planner
+}  // namespace autoware
 
 #include <pluginlib/class_list_macros.hpp>
 PLUGINLIB_EXPORT_CLASS(
-  behavior_path_planner::AvoidanceByLaneChangeModuleManager,
-  behavior_path_planner::SceneModuleManagerInterface)
+  autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager,
+  autoware::behavior_path_planner::SceneModuleManagerInterface)
diff --git a/planning/behavior_path_avoidance_by_lane_change_module/src/scene.cpp b/planning/behavior_path_avoidance_by_lane_change_module/src/scene.cpp
@@ -32,9 +32,11 @@
 #include <optional>
 #include <utility>
 
+namespace autoware
+{
 namespace behavior_path_planner
 {
-using behavior_path_planner::utils::lane_change::debug::createExecutionArea;
+using autoware::behavior_path_planner::utils::lane_change::debug::createExecutionArea;
 
 AvoidanceByLaneChange::AvoidanceByLaneChange(
   const std::shared_ptr<LaneChangeParameters> & parameters,
@@ -294,3 +296,4 @@ double AvoidanceByLaneChange::calcLateralOffset() const
   return additional_lat_offset;
 }
 }  // namespace behavior_path_planner
+}  // namespace autoware
diff --git a/...r_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp b/...r_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp
@@ -23,7 +23,7 @@
 #include <cmath>
 #include <vector>
 
-using behavior_path_planner::BehaviorPathPlannerNode;
+using autoware::behavior_path_planner::BehaviorPathPlannerNode;
 using planning_test_utils::PlanningInterfaceTestManager;
 
 std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()
@@ -52,7 +52,7 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
     ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
 
   std::vector<std::string> module_names;
-  module_names.emplace_back("behavior_path_planner::AvoidanceByLaneChangeModuleManager");
+  module_names.emplace_back("autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager");
 
   std::vector<rclcpp::Parameter> params;
   params.emplace_back("launch_modules", module_names);