Skip to content

Commit 25cf700

Browse files
authored
refactor(behavior_velocity_template_module): prefix package and namespace with autoware_ (#6639)
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent 74ac782 commit 25cf700

File tree

13 files changed

+27
-23
lines changed

13 files changed

+27
-23
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ perception/traffic_light_occlusion_predictor/** shunsuke.miura@tier4.jp tao.zhon
147147
perception/traffic_light_visualization/** tao.zhong@tier4.jp yukihiro.saito@tier4.jp
148148
planning/autoware_behavior_path_external_request_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
149149
planning/autoware_behavior_velocity_planner/** kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp maxime.clement@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
150+
planning/autoware_behavior_velocity_template_module/** daniel.sanchez@tier4.jp
150151
planning/autoware_planning_test_manager/** kyoichi.sugahara@tier4.jp takamasa.horibe@tier4.jp
151152
planning/autoware_remaining_distance_time_calculator/** ahmed.ebrahim@leodrive.ai
152153
planning/autoware_static_centerline_generator/** kosuke.takeuchi@tier4.jp takayuki.murooka@tier4.jp
@@ -173,7 +174,6 @@ planning/behavior_velocity_planner_common/** fumiya.watanabe@tier4.jp isamu.taka
173174
planning/behavior_velocity_run_out_module/** kosuke.takeuchi@tier4.jp makoto.kurihara@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
174175
planning/behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
175176
planning/behavior_velocity_stop_line_module/** fumiya.watanabe@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp zhe.shen@tier4.jp
176-
planning/behavior_velocity_template_module/** daniel.sanchez@tier4.jp
177177
planning/behavior_velocity_traffic_light_module/** mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
178178
planning/behavior_velocity_virtual_traffic_light_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
179179
planning/behavior_velocity_walkway_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp

planning/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ nav:
1919
- 'Start Planner': planning/behavior_path_start_planner_module
2020
- 'Behavior Velocity Planner':
2121
- 'About Behavior Velocity': planning/autoware_behavior_velocity_planner
22-
- 'Template for Custom Module': planning/behavior_velocity_template_module
22+
- 'Template for Custom Module': planning/autoware_behavior_velocity_template_module
2323
- 'Available Module':
2424
- 'Blind Spot': planning/behavior_velocity_blind_spot_module
2525
- 'Crosswalk': planning/behavior_velocity_crosswalk_module

planning/autoware_behavior_velocity_planner/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<test_depend>behavior_velocity_traffic_light_module</test_depend>
8181
<test_depend>behavior_velocity_virtual_traffic_light_module</test_depend>
8282
<test_depend>behavior_velocity_walkway_module</test_depend>
83-
<!--<test_depend>behavior_velocity_template_module</test_depend>-->
83+
<!--<test_depend>autoware_behavior_velocity_template_module</test_depend>-->
8484

8585
<member_of_group>rosidl_interface_packages</member_of_group>
8686

planning/behavior_velocity_template_module/CMakeLists.txt planning/autoware_behavior_velocity_template_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_velocity_template_module)
2+
project(autoware_behavior_velocity_template_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

planning/behavior_velocity_template_module/README.md planning/autoware_behavior_velocity_template_module/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The managing of your modules is defined in manager.hpp and manager.cpp. The mana
4141
#### Constructor `TemplateModuleManager`
4242

4343
- This is the constructor of the `TemplateModuleManager` class, and it takes an `rclcpp::Node` reference as a parameter.
44-
- It initializes a member variable `dummy_parameter` to 0.0.
44+
- It initializes a member variable `dummy_parameter_` to 0.0.
4545

4646
#### `getModuleName()` Method
4747

planning/behavior_velocity_template_module/package.xml planning/autoware_behavior_velocity_template_module/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_template_module</name>
4+
<name>autoware_behavior_velocity_template_module</name>
55
<version>0.1.0</version>
6-
<description>The behavior_velocity_template_module package</description>
6+
<description>The autoware_behavior_velocity_template_module package</description>
77

88
<maintainer email="daniel.sanchez@tier4.jp">Daniel Sanchez</maintainer>
99

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<library path="autoware_behavior_velocity_template_module">
2+
<class type="autoware::behavior_velocity_planner::TemplateModulePlugin" base_class_type="autoware::behavior_velocity_planner::PluginInterface"/>
3+
</library>

planning/behavior_velocity_template_module/src/manager.cpp planning/autoware_behavior_velocity_template_module/src/manager.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
#include <utility>
2727
#include <vector>
2828

29-
namespace behavior_velocity_planner
29+
namespace autoware::behavior_velocity_planner
3030
{
3131
using tier4_autoware_utils::getOrDeclareParameter;
3232

3333
TemplateModuleManager::TemplateModuleManager(rclcpp::Node & node)
3434
: SceneModuleManagerInterface(node, getModuleName())
3535
{
3636
std::string ns(getModuleName());
37-
dummy_parameter = getOrDeclareParameter<double>(node, ns + ".dummy");
37+
dummy_parameter_ = getOrDeclareParameter<double>(node, ns + ".dummy");
3838
}
3939

4040
void TemplateModuleManager::launchNewModules(
@@ -56,8 +56,9 @@ TemplateModuleManager::getModuleExpiredFunction(
5656
};
5757
}
5858

59-
} // namespace behavior_velocity_planner
59+
} // namespace autoware::behavior_velocity_planner
6060

6161
#include <pluginlib/class_list_macros.hpp>
6262
PLUGINLIB_EXPORT_CLASS(
63-
behavior_velocity_planner::TemplateModulePlugin, behavior_velocity_planner::PluginInterface)
63+
autoware::behavior_velocity_planner::TemplateModulePlugin,
64+
behavior_velocity_planner::PluginInterface)

planning/behavior_velocity_template_module/src/manager.hpp planning/autoware_behavior_velocity_template_module/src/manager.hpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <functional>
2828
#include <memory>
2929

30-
namespace behavior_velocity_planner
30+
namespace autoware::behavior_velocity_planner
3131
{
3232
/**
3333
* @brief Constructor for the TemplateModuleManager class.
@@ -37,7 +37,7 @@ namespace behavior_velocity_planner
3737
*
3838
* @param node A reference to the ROS node.
3939
*/
40-
class TemplateModuleManager : public SceneModuleManagerInterface
40+
class TemplateModuleManager : public ::behavior_velocity_planner::SceneModuleManagerInterface
4141
{
4242
public:
4343
explicit TemplateModuleManager(rclcpp::Node & node);
@@ -53,7 +53,7 @@ class TemplateModuleManager : public SceneModuleManagerInterface
5353
const char * getModuleName() override { return "template"; }
5454

5555
private:
56-
double dummy_parameter{0.0};
56+
double dummy_parameter_{0.0};
5757

5858
/**
5959
* @brief Launch new modules based on the provided path.
@@ -84,10 +84,11 @@ class TemplateModuleManager : public SceneModuleManagerInterface
8484
* The TemplateModulePlugin class is used to integrate the TemplateModuleManager into the Behavior
8585
* Velocity Planner.
8686
*/
87-
class TemplateModulePlugin : public PluginWrapper<TemplateModuleManager>
87+
class TemplateModulePlugin
88+
: public ::behavior_velocity_planner::PluginWrapper<TemplateModuleManager>
8889
{
8990
};
9091

91-
} // namespace behavior_velocity_planner
92+
} // namespace autoware::behavior_velocity_planner
9293

9394
#endif // MANAGER_HPP_

planning/behavior_velocity_template_module/src/scene.cpp planning/autoware_behavior_velocity_template_module/src/scene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <string>
2323

24-
namespace behavior_velocity_planner
24+
namespace autoware::behavior_velocity_planner
2525
{
2626

2727
TemplateModule::TemplateModule(
@@ -49,4 +49,4 @@ bool TemplateModule::modifyPathVelocity(
4949
return false;
5050
}
5151

52-
} // namespace behavior_velocity_planner
52+
} // namespace autoware::behavior_velocity_planner

planning/behavior_velocity_template_module/src/scene.hpp planning/autoware_behavior_velocity_template_module/src/scene.hpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
#include <utility>
2222
#include <vector>
2323

24-
namespace behavior_velocity_planner
24+
namespace autoware::behavior_velocity_planner
2525
{
2626
using autoware_auto_planning_msgs::msg::PathWithLaneId;
27+
using ::behavior_velocity_planner::SceneModuleInterface;
28+
using ::behavior_velocity_planner::StopReason;
2729

2830
class TemplateModule : public SceneModuleInterface
2931
{
@@ -64,6 +66,6 @@ class TemplateModule : public SceneModuleInterface
6466
motion_utils::VirtualWalls createVirtualWalls() override;
6567
};
6668

67-
} // namespace behavior_velocity_planner
69+
} // namespace autoware::behavior_velocity_planner
6870

6971
#endif // SCENE_HPP_

planning/behavior_velocity_template_module/plugins.xml

-3
This file was deleted.

0 commit comments

Comments
 (0)