Skip to content

Commit d743317

Browse files
committed
build(behavior_velocity_planner): build(static_centerline_optimizer): prefix package and namespace with autoware_
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent dd7c252 commit d743317

File tree

8 files changed

+23
-11
lines changed

8 files changed

+23
-11
lines changed

planning/behavior_velocity_planner/CMakeLists.txt

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

44
find_package(autoware_cmake REQUIRED)
55
find_package(rosidl_default_generators REQUIRED)
@@ -19,7 +19,7 @@ ament_auto_add_library(${PROJECT_NAME}_lib SHARED
1919
)
2020

2121
rclcpp_components_register_node(${PROJECT_NAME}_lib
22-
PLUGIN "behavior_velocity_planner::BehaviorVelocityPlannerNode"
22+
PLUGIN "autoware::behavior_velocity_planner::BehaviorVelocityPlannerNode"
2323
EXECUTABLE ${PROJECT_NAME}_node
2424
)
2525

planning/behavior_velocity_planner/launch/behavior_velocity_planner.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<!-- <arg name="behavior_velocity_planner_template_module_param_path"/> -->
3131
<arg name="behavior_velocity_planner_param_file" default="$(find-pkg-share behavior_velocity_planner)/config/behavior_velocity_planner.param.yaml"/>
3232

33-
<node pkg="behavior_velocity_planner" exec="behavior_velocity_planner_node" name="behavior_velocity_planner" output="screen">
33+
<node pkg="autoware_behavior_velocity_planner" exec="autoware_behavior_velocity_planner_node" name="behavior_velocity_planner" output="screen">
3434
<!-- topic remap -->
3535
<remap from="~/input/path_with_lane_id" to="path_with_lane_id"/>
3636
<remap from="~/input/vector_map" to="/map/vector_map"/>

planning/behavior_velocity_planner/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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_velocity_planner</name>
4+
<name>autoware_behavior_velocity_planner</name>
55
<version>0.1.0</version>
6-
<description>The behavior_velocity_planner package</description>
6+
<description>The autoware_behavior_velocity_planner package</description>
77

88
<maintainer email="mamoru.sobue@tier4.jp">Mamoru Sobue</maintainer>
99
<maintainer email="takayuki.murooka@tier4.jp">Takayuki Murooka</maintainer>

planning/behavior_velocity_planner/src/node.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ rclcpp::SubscriptionOptions createSubscriptionOptions(rclcpp::Node * node_ptr)
5252
}
5353
} // namespace
5454

55+
namespace autoware
56+
{
5557
namespace behavior_velocity_planner
5658
{
5759
namespace
@@ -476,6 +478,7 @@ void BehaviorVelocityPlannerNode::publishDebugMarker(
476478
debug_viz_pub_->publish(output_msg);
477479
}
478480
} // namespace behavior_velocity_planner
481+
} // namespace autoware
479482

480483
#include <rclcpp_components/register_node_macro.hpp>
481-
RCLCPP_COMPONENTS_REGISTER_NODE(behavior_velocity_planner::BehaviorVelocityPlannerNode)
484+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::behavior_velocity_planner::BehaviorVelocityPlannerNode)

planning/behavior_velocity_planner/src/node.hpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@
4444
#include <string>
4545
#include <vector>
4646

47+
namespace autoware
48+
{
4749
namespace behavior_velocity_planner
4850
{
4951
using autoware_auto_mapping_msgs::msg::HADMapBin;
50-
using behavior_velocity_planner::srv::LoadPlugin;
51-
using behavior_velocity_planner::srv::UnloadPlugin;
52+
using autoware::behavior_velocity_planner::srv::LoadPlugin;
53+
using autoware::behavior_velocity_planner::srv::UnloadPlugin;
5254
using tier4_planning_msgs::msg::VelocityLimit;
5355

5456
class BehaviorVelocityPlannerNode : public rclcpp::Node
@@ -135,5 +137,6 @@ class BehaviorVelocityPlannerNode : public rclcpp::Node
135137
std::unique_ptr<tier4_autoware_utils::PublishedTimePublisher> published_time_publisher_;
136138
};
137139
} // namespace behavior_velocity_planner
140+
} // namespace autoware
138141

139142
#endif // NODE_HPP_

planning/behavior_velocity_planner/src/planner_manager.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <memory>
2020
#include <string>
2121

22+
namespace autoware
23+
{
2224
namespace behavior_velocity_planner
2325
{
2426
namespace
@@ -50,7 +52,7 @@ diagnostic_msgs::msg::DiagnosticStatus makeStopReasonDiag(
5052
} // namespace
5153

5254
BehaviorVelocityPlannerManager::BehaviorVelocityPlannerManager()
53-
: plugin_loader_("behavior_velocity_planner", "behavior_velocity_planner::PluginInterface")
55+
: plugin_loader_("behavior_velocity_planner", "autoware::behavior_velocity_planner::PluginInterface")
5456
{
5557
}
5658

@@ -82,7 +84,7 @@ void BehaviorVelocityPlannerManager::removeScenePlugin(
8284
{
8385
auto it = std::remove_if(
8486
scene_manager_plugins_.begin(), scene_manager_plugins_.end(),
85-
[&](const std::shared_ptr<behavior_velocity_planner::PluginInterface> plugin) {
87+
[&](const std::shared_ptr<autoware::behavior_velocity_planner::PluginInterface> plugin) {
8688
return plugin->getModuleName() == name;
8789
});
8890

@@ -129,3 +131,4 @@ diagnostic_msgs::msg::DiagnosticStatus BehaviorVelocityPlannerManager::getStopRe
129131
return stop_reason_diag_;
130132
}
131133
} // namespace behavior_velocity_planner
134+
} // namespace autoware

planning/behavior_velocity_planner/src/planner_manager.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#include <string>
3737
#include <vector>
3838

39+
namespace autoware
40+
{
3941
namespace behavior_velocity_planner
4042
{
4143
class BehaviorVelocityPlannerManager
@@ -57,5 +59,6 @@ class BehaviorVelocityPlannerManager
5759
std::vector<std::shared_ptr<PluginInterface>> scene_manager_plugins_;
5860
};
5961
} // namespace behavior_velocity_planner
62+
} // namespace autoware
6063

6164
#endif // PLANNER_MANAGER_HPP_

planning/behavior_velocity_planner/test/src/test_node_interface.cpp

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

26-
using behavior_velocity_planner::BehaviorVelocityPlannerNode;
26+
using autoware::behavior_velocity_planner::BehaviorVelocityPlannerNode;
2727
using planning_test_utils::PlanningInterfaceTestManager;
2828

2929
std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()

0 commit comments

Comments
 (0)