Skip to content

Commit 60737b5

Browse files
committed
build(behavior_path_avoidance_by_lane_change_module): prefix package and namespace with autoware_
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent aa0c633 commit 60737b5

File tree

11 files changed

+29
-8
lines changed

11 files changed

+29
-8
lines changed

planning/behavior_path_avoidance_by_lane_change_module/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(behavior_path_avoidance_by_lane_change_module)
2+
project(autoware_behavior_path_avoidance_by_lane_change_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

planning/behavior_path_avoidance_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/data_structs.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include "behavior_path_avoidance_module/data_structs.hpp"
1818

19+
namespace autoware
20+
{
1921
namespace behavior_path_planner
2022
{
2123
struct AvoidanceByLCParameters : public AvoidanceParameters
@@ -31,5 +33,6 @@ struct AvoidanceByLCParameters : public AvoidanceParameters
3133
}
3234
};
3335
} // namespace behavior_path_planner
36+
} // namespace autoware
3437

3538
#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_

planning/behavior_path_avoidance_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/interface.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include <string>
2626
#include <unordered_map>
2727

28+
namespace autoware
29+
{
2830
namespace behavior_path_planner
2931
{
3032
class AvoidanceByLaneChangeInterface : public LaneChangeInterface
@@ -46,5 +48,6 @@ class AvoidanceByLaneChangeInterface : public LaneChangeInterface
4648
void updateRTCStatus(const double start_distance, const double finish_distance) override;
4749
};
4850
} // namespace behavior_path_planner
51+
} // namespace autoware
4952

5053
#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_

planning/behavior_path_avoidance_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/manager.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include <unordered_map>
2727
#include <vector>
2828

29+
namespace autoware
30+
{
2931
namespace behavior_path_planner
3032
{
3133
using route_handler::Direction;
@@ -48,5 +50,6 @@ class AvoidanceByLaneChangeModuleManager : public LaneChangeModuleManager
4850
std::shared_ptr<AvoidanceByLCParameters> avoidance_parameters_;
4951
};
5052
} // namespace behavior_path_planner
53+
} // namespace autoware
5154

5255
#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_

planning/behavior_path_avoidance_by_lane_change_module/include/behavior_path_avoidance_by_lane_change_module/scene.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
#include <memory>
2323

24+
namespace autoware
25+
{
2426
namespace behavior_path_planner
2527
{
2628
using AvoidanceDebugData = DebugData;
@@ -60,5 +62,6 @@ class AvoidanceByLaneChange : public NormalLaneChange
6062
double calcLateralOffset() const;
6163
};
6264
} // namespace behavior_path_planner
65+
} // namespace autoware
6366

6467
#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_

planning/behavior_path_avoidance_by_lane_change_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>behavior_path_avoidance_by_lane_change_module</name>
4+
<name>autoware_behavior_path_avoidance_by_lane_change_module</name>
55
<version>0.1.0</version>
66
<description>The behavior_path_avoidance_by_lane_change_module package</description>
77

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<library path="behavior_path_avoidance_by_lane_change_module">
2-
<class type="behavior_path_planner::AvoidanceByLaneChangeModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
2+
<class type="autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager" base_class_type="autoware::behavior_path_planner::SceneModuleManagerInterface"/>
33
</library>

planning/behavior_path_avoidance_by_lane_change_module/src/interface.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include <memory>
2121
#include <string>
2222

23+
namespace autoware
24+
{
2325
namespace behavior_path_planner
2426
{
2527
AvoidanceByLaneChangeInterface::AvoidanceByLaneChangeInterface(
@@ -61,3 +63,4 @@ void AvoidanceByLaneChangeInterface::updateRTCStatus(
6163
uuid_map_.at(direction), isExecutionReady(), start_distance, finish_distance, clock_->now());
6264
}
6365
} // namespace behavior_path_planner
66+
} // namespace autoware

planning/behavior_path_avoidance_by_lane_change_module/src/manager.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include <string>
2626
#include <vector>
2727

28+
namespace autoware
29+
{
2830
namespace behavior_path_planner
2931
{
3032

@@ -187,8 +189,9 @@ AvoidanceByLaneChangeModuleManager::createNewSceneModuleInstance()
187189
}
188190

189191
} // namespace behavior_path_planner
192+
} // namespace autoware
190193

191194
#include <pluginlib/class_list_macros.hpp>
192195
PLUGINLIB_EXPORT_CLASS(
193-
behavior_path_planner::AvoidanceByLaneChangeModuleManager,
194-
behavior_path_planner::SceneModuleManagerInterface)
196+
autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager,
197+
autoware::behavior_path_planner::SceneModuleManagerInterface)

planning/behavior_path_avoidance_by_lane_change_module/src/scene.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@
3131
#include <limits>
3232
#include <utility>
3333

34+
namespace autoware
35+
{
3436
namespace behavior_path_planner
3537
{
36-
using behavior_path_planner::utils::lane_change::debug::createExecutionArea;
38+
using autoware::behavior_path_planner::utils::lane_change::debug::createExecutionArea;
3739

3840
AvoidanceByLaneChange::AvoidanceByLaneChange(
3941
const std::shared_ptr<LaneChangeParameters> & parameters,
@@ -299,3 +301,4 @@ double AvoidanceByLaneChange::calcLateralOffset() const
299301
return additional_lat_offset;
300302
}
301303
} // namespace behavior_path_planner
304+
} // namespace autoware

planning/behavior_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <cmath>
2424
#include <vector>
2525

26-
using behavior_path_planner::BehaviorPathPlannerNode;
26+
using autoware::behavior_path_planner::BehaviorPathPlannerNode;
2727
using planning_test_utils::PlanningInterfaceTestManager;
2828

2929
std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()
@@ -52,7 +52,7 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
5252
ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
5353

5454
std::vector<std::string> module_names;
55-
module_names.emplace_back("behavior_path_planner::AvoidanceByLaneChangeModuleManager");
55+
module_names.emplace_back("autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager");
5656

5757
std::vector<rclcpp::Parameter> params;
5858
params.emplace_back("launch_modules", module_names);

0 commit comments

Comments
 (0)