Commit 191465d 1 parent eae2aaa commit 191465d Copy full SHA for 191465d
File tree 37 files changed +44
-44
lines changed
autoware_behavior_velocity_planner/src
behavior_velocity_blind_spot_module
behavior_velocity_crosswalk_module/src
behavior_velocity_detection_area_module/src
behavior_velocity_dynamic_obstacle_stop_module/src
behavior_velocity_intersection_module/src
behavior_velocity_no_drivable_lane_module/src
behavior_velocity_no_stopping_area_module/src
behavior_velocity_occlusion_spot_module/src
behavior_velocity_out_of_lane_module/src
behavior_velocity_planner_common/include/behavior_velocity_planner_common
behavior_velocity_run_out_module/src
behavior_velocity_speed_bump_module/src
behavior_velocity_stop_line_module/src
behavior_velocity_template_module/src
behavior_velocity_traffic_light_module/src
behavior_velocity_virtual_traffic_light_module/src
behavior_velocity_walkway_module/src
37 files changed +44
-44
lines changed Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ diagnostic_msgs::msg::DiagnosticStatus makeStopReasonDiag(
51
51
52
52
BehaviorVelocityPlannerManager::BehaviorVelocityPlannerManager ()
53
53
: plugin_loader_(
54
- " autoware_behavior_velocity_planner" , " behavior_velocity_planner::PluginInterface" )
54
+ " autoware_behavior_velocity_planner" , " autoware:: behavior_velocity_planner::PluginInterface" )
55
55
{
56
56
}
57
57
@@ -83,7 +83,7 @@ void BehaviorVelocityPlannerManager::removeScenePlugin(
83
83
{
84
84
auto it = std::remove_if (
85
85
scene_manager_plugins_.begin (), scene_manager_plugins_.end (),
86
- [&](const std::shared_ptr<behavior_velocity_planner::PluginInterface> plugin) {
86
+ [&](const std::shared_ptr<autoware:: behavior_velocity_planner::PluginInterface> plugin) {
87
87
return plugin->getModuleName () == name;
88
88
});
89
89
Original file line number Diff line number Diff line change 39
39
namespace autoware ::behavior_velocity_planner
40
40
{
41
41
using ::behavior_velocity_planner::PlannerData;
42
- using ::behavior_velocity_planner::PluginInterface;
43
42
44
43
class BehaviorVelocityPlannerManager
45
44
{
Original file line number Diff line number Diff line change 1
1
<library path =" behavior_velocity_blind_spot_module" >
2
- <class type =" behavior_velocity_planner::BlindSpotModulePlugin" base_class_type =" behavior_velocity_planner::PluginInterface" />
2
+ <class type =" behavior_velocity_planner::BlindSpotModulePlugin" base_class_type =" autoware:: behavior_velocity_planner::PluginInterface" />
3
3
</library >
Original file line number Diff line number Diff line change @@ -94,4 +94,4 @@ BlindSpotModuleManager::getModuleExpiredFunction(
94
94
95
95
#include < pluginlib/class_list_macros.hpp>
96
96
PLUGINLIB_EXPORT_CLASS (
97
- behavior_velocity_planner::BlindSpotModulePlugin, behavior_velocity_planner::PluginInterface)
97
+ behavior_velocity_planner::BlindSpotModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ class BlindSpotModuleManager : public SceneModuleManagerInterfaceWithRTC
45
45
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
46
46
};
47
47
48
- class BlindSpotModulePlugin : public PluginWrapper <BlindSpotModuleManager>
48
+ class BlindSpotModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<BlindSpotModuleManager>
49
49
{
50
50
};
51
51
Original file line number Diff line number Diff line change @@ -235,4 +235,4 @@ CrosswalkModuleManager::getModuleExpiredFunction(const PathWithLaneId & path)
235
235
236
236
#include < pluginlib/class_list_macros.hpp>
237
237
PLUGINLIB_EXPORT_CLASS (
238
- behavior_velocity_planner::CrosswalkModulePlugin, behavior_velocity_planner::PluginInterface)
238
+ behavior_velocity_planner::CrosswalkModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ class CrosswalkModuleManager : public SceneModuleManagerInterfaceWithRTC
53
53
const PathWithLaneId & path) override ;
54
54
};
55
55
56
- class CrosswalkModulePlugin : public PluginWrapper <CrosswalkModuleManager>
56
+ class CrosswalkModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<CrosswalkModuleManager>
57
57
{
58
58
};
59
59
} // namespace behavior_velocity_planner
Original file line number Diff line number Diff line change @@ -88,4 +88,4 @@ DetectionAreaModuleManager::getModuleExpiredFunction(
88
88
89
89
#include < pluginlib/class_list_macros.hpp>
90
90
PLUGINLIB_EXPORT_CLASS (
91
- behavior_velocity_planner::DetectionAreaModulePlugin, behavior_velocity_planner::PluginInterface)
91
+ behavior_velocity_planner::DetectionAreaModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ class DetectionAreaModuleManager : public SceneModuleManagerInterfaceWithRTC
45
45
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
46
46
};
47
47
48
- class DetectionAreaModulePlugin : public PluginWrapper <DetectionAreaModuleManager>
48
+ class DetectionAreaModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<DetectionAreaModuleManager>
49
49
{
50
50
};
51
51
Original file line number Diff line number Diff line change @@ -73,4 +73,4 @@ DynamicObstacleStopModuleManager::getModuleExpiredFunction(
73
73
#include < pluginlib/class_list_macros.hpp>
74
74
PLUGINLIB_EXPORT_CLASS (
75
75
behavior_velocity_planner::DynamicObstacleStopModulePlugin,
76
- behavior_velocity_planner::PluginInterface)
76
+ autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ class DynamicObstacleStopModuleManager : public SceneModuleManagerInterface
49
49
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
50
50
};
51
51
52
- class DynamicObstacleStopModulePlugin : public PluginWrapper <DynamicObstacleStopModuleManager>
52
+ class DynamicObstacleStopModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<DynamicObstacleStopModuleManager>
53
53
{
54
54
};
55
55
Original file line number Diff line number Diff line change @@ -593,7 +593,7 @@ bool MergeFromPrivateModuleManager::hasSameParentLaneletAndTurnDirectionWithRegi
593
593
594
594
#include < pluginlib/class_list_macros.hpp>
595
595
PLUGINLIB_EXPORT_CLASS (
596
- behavior_velocity_planner::IntersectionModulePlugin, behavior_velocity_planner::PluginInterface)
596
+ behavior_velocity_planner::IntersectionModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
597
597
PLUGINLIB_EXPORT_CLASS(
598
598
behavior_velocity_planner::MergeFromPrivateModulePlugin,
599
- behavior_velocity_planner::PluginInterface)
599
+ autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -81,11 +81,11 @@ class MergeFromPrivateModuleManager : public SceneModuleManagerInterface
81
81
bool hasSameParentLaneletAndTurnDirectionWithRegistered (const lanelet::ConstLanelet & lane) const ;
82
82
};
83
83
84
- class IntersectionModulePlugin : public PluginWrapper <IntersectionModuleManager>
84
+ class IntersectionModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<IntersectionModuleManager>
85
85
{
86
86
};
87
87
88
- class MergeFromPrivateModulePlugin : public PluginWrapper <MergeFromPrivateModuleManager>
88
+ class MergeFromPrivateModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<MergeFromPrivateModuleManager>
89
89
{
90
90
};
91
91
Original file line number Diff line number Diff line change @@ -70,4 +70,4 @@ NoDrivableLaneModuleManager::getModuleExpiredFunction(
70
70
71
71
#include < pluginlib/class_list_macros.hpp>
72
72
PLUGINLIB_EXPORT_CLASS (
73
- behavior_velocity_planner::NoDrivableLaneModulePlugin, behavior_velocity_planner::PluginInterface)
73
+ behavior_velocity_planner::NoDrivableLaneModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ class NoDrivableLaneModuleManager : public SceneModuleManagerInterface
45
45
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
46
46
};
47
47
48
- class NoDrivableLaneModulePlugin : public PluginWrapper <NoDrivableLaneModuleManager>
48
+ class NoDrivableLaneModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<NoDrivableLaneModuleManager>
49
49
{
50
50
};
51
51
Original file line number Diff line number Diff line change @@ -90,4 +90,4 @@ NoStoppingAreaModuleManager::getModuleExpiredFunction(
90
90
91
91
#include < pluginlib/class_list_macros.hpp>
92
92
PLUGINLIB_EXPORT_CLASS (
93
- behavior_velocity_planner::NoStoppingAreaModulePlugin, behavior_velocity_planner::PluginInterface)
93
+ behavior_velocity_planner::NoStoppingAreaModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ class NoStoppingAreaModuleManager : public SceneModuleManagerInterfaceWithRTC
45
45
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
46
46
};
47
47
48
- class NoStoppingAreaModulePlugin : public PluginWrapper <NoStoppingAreaModuleManager>
48
+ class NoStoppingAreaModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<NoStoppingAreaModuleManager>
49
49
{
50
50
};
51
51
Original file line number Diff line number Diff line change @@ -140,4 +140,4 @@ OcclusionSpotModuleManager::getModuleExpiredFunction(
140
140
141
141
#include < pluginlib/class_list_macros.hpp>
142
142
PLUGINLIB_EXPORT_CLASS (
143
- behavior_velocity_planner::OcclusionSpotModulePlugin, behavior_velocity_planner::PluginInterface)
143
+ behavior_velocity_planner::OcclusionSpotModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ class OcclusionSpotModuleManager : public SceneModuleManagerInterface
59
59
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
60
60
};
61
61
62
- class OcclusionSpotModulePlugin : public PluginWrapper <OcclusionSpotModuleManager>
62
+ class OcclusionSpotModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<OcclusionSpotModuleManager>
63
63
{
64
64
};
65
65
Original file line number Diff line number Diff line change @@ -105,4 +105,4 @@ OutOfLaneModuleManager::getModuleExpiredFunction(
105
105
106
106
#include < pluginlib/class_list_macros.hpp>
107
107
PLUGINLIB_EXPORT_CLASS (
108
- behavior_velocity_planner::OutOfLaneModulePlugin, behavior_velocity_planner::PluginInterface)
108
+ behavior_velocity_planner::OutOfLaneModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ class OutOfLaneModuleManager : public SceneModuleManagerInterface
57
57
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
58
58
};
59
59
60
- class OutOfLaneModulePlugin : public PluginWrapper <OutOfLaneModuleManager>
60
+ class OutOfLaneModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<OutOfLaneModuleManager>
61
61
{
62
62
};
63
63
Original file line number Diff line number Diff line change 22
22
23
23
#include < memory>
24
24
25
- namespace behavior_velocity_planner
25
+ namespace autoware :: behavior_velocity_planner
26
26
{
27
27
28
28
class PluginInterface
29
29
{
30
+
30
31
public:
31
32
virtual ~PluginInterface () = default ;
32
33
virtual void init (rclcpp::Node & node) = 0;
33
34
virtual void plan (autoware_auto_planning_msgs::msg::PathWithLaneId * path) = 0;
34
35
virtual void updateSceneModuleInstances (
35
- const std::shared_ptr<const PlannerData> & planner_data,
36
+ const std::shared_ptr<const ::behavior_velocity_planner:: PlannerData> & planner_data,
36
37
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) = 0;
37
38
virtual std::optional<int > getFirstStopPathPointIndex () = 0;
38
39
virtual const char * getModuleName () = 0;
39
40
};
40
41
41
- } // namespace behavior_velocity_planner
42
+ } // namespace autoware:: behavior_velocity_planner
42
43
43
44
#endif // BEHAVIOR_VELOCITY_PLANNER_COMMON__PLUGIN_INTERFACE_HPP_
Original file line number Diff line number Diff line change 20
20
#include < memory>
21
21
#include < optional>
22
22
23
- namespace behavior_velocity_planner
23
+ namespace autoware :: behavior_velocity_planner
24
24
{
25
25
26
26
template <class T >
@@ -33,7 +33,7 @@ class PluginWrapper : public PluginInterface
33
33
scene_manager_->plan (path);
34
34
};
35
35
void updateSceneModuleInstances (
36
- const std::shared_ptr<const PlannerData> & planner_data,
36
+ const std::shared_ptr<const ::behavior_velocity_planner:: PlannerData> & planner_data,
37
37
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override
38
38
{
39
39
scene_manager_->updateSceneModuleInstances (planner_data, path);
@@ -48,6 +48,6 @@ class PluginWrapper : public PluginInterface
48
48
std::unique_ptr<T> scene_manager_;
49
49
};
50
50
51
- } // namespace behavior_velocity_planner
51
+ } // namespace autoware:: behavior_velocity_planner
52
52
53
53
#endif // BEHAVIOR_VELOCITY_PLANNER_COMMON__PLUGIN_WRAPPER_HPP_
Original file line number Diff line number Diff line change @@ -204,4 +204,4 @@ void RunOutModuleManager::setDynamicObstacleCreator(
204
204
205
205
#include < pluginlib/class_list_macros.hpp>
206
206
PLUGINLIB_EXPORT_CLASS (
207
- behavior_velocity_planner::RunOutModulePlugin, behavior_velocity_planner::PluginInterface)
207
+ behavior_velocity_planner::RunOutModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ class RunOutModuleManager : public SceneModuleManagerInterface
45
45
void setDynamicObstacleCreator (rclcpp::Node & node, std::shared_ptr<RunOutDebug> & debug_ptr);
46
46
};
47
47
48
- class RunOutModulePlugin : public PluginWrapper <RunOutModuleManager>
48
+ class RunOutModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<RunOutModuleManager>
49
49
{
50
50
};
51
51
Original file line number Diff line number Diff line change @@ -85,4 +85,4 @@ SpeedBumpModuleManager::getModuleExpiredFunction(
85
85
86
86
#include < pluginlib/class_list_macros.hpp>
87
87
PLUGINLIB_EXPORT_CLASS (
88
- behavior_velocity_planner::SpeedBumpModulePlugin, behavior_velocity_planner::PluginInterface)
88
+ behavior_velocity_planner::SpeedBumpModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ class SpeedBumpModuleManager : public SceneModuleManagerInterface
45
45
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
46
46
};
47
47
48
- class SpeedBumpModulePlugin : public PluginWrapper <SpeedBumpModuleManager>
48
+ class SpeedBumpModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<SpeedBumpModuleManager>
49
49
{
50
50
};
51
51
Original file line number Diff line number Diff line change @@ -109,4 +109,4 @@ StopLineModuleManager::getModuleExpiredFunction(
109
109
110
110
#include < pluginlib/class_list_macros.hpp>
111
111
PLUGINLIB_EXPORT_CLASS (
112
- behavior_velocity_planner::StopLineModulePlugin, behavior_velocity_planner::PluginInterface)
112
+ behavior_velocity_planner::StopLineModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ class StopLineModuleManager : public SceneModuleManagerInterface
58
58
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
59
59
};
60
60
61
- class StopLineModulePlugin : public PluginWrapper <StopLineModuleManager>
61
+ class StopLineModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<StopLineModuleManager>
62
62
{
63
63
};
64
64
Original file line number Diff line number Diff line change @@ -60,4 +60,4 @@ TemplateModuleManager::getModuleExpiredFunction(
60
60
61
61
#include < pluginlib/class_list_macros.hpp>
62
62
PLUGINLIB_EXPORT_CLASS (
63
- behavior_velocity_planner::TemplateModulePlugin, behavior_velocity_planner::PluginInterface)
63
+ behavior_velocity_planner::TemplateModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ class TemplateModuleManager : public SceneModuleManagerInterface
84
84
* The TemplateModulePlugin class is used to integrate the TemplateModuleManager into the Behavior
85
85
* Velocity Planner.
86
86
*/
87
- class TemplateModulePlugin : public PluginWrapper <TemplateModuleManager>
87
+ class TemplateModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<TemplateModuleManager>
88
88
{
89
89
};
90
90
Original file line number Diff line number Diff line change @@ -210,4 +210,4 @@ bool TrafficLightModuleManager::hasSameTrafficLight(
210
210
211
211
#include < pluginlib/class_list_macros.hpp>
212
212
PLUGINLIB_EXPORT_CLASS (
213
- behavior_velocity_planner::TrafficLightModulePlugin, behavior_velocity_planner::PluginInterface)
213
+ behavior_velocity_planner::TrafficLightModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ class TrafficLightModuleManager : public SceneModuleManagerInterfaceWithRTC
61
61
std::optional<int > first_ref_stop_path_point_index_;
62
62
};
63
63
64
- class TrafficLightModulePlugin : public PluginWrapper <TrafficLightModuleManager>
64
+ class TrafficLightModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<TrafficLightModuleManager>
65
65
{
66
66
};
67
67
Original file line number Diff line number Diff line change @@ -81,4 +81,4 @@ VirtualTrafficLightModuleManager::getModuleExpiredFunction(
81
81
#include < pluginlib/class_list_macros.hpp>
82
82
PLUGINLIB_EXPORT_CLASS (
83
83
behavior_velocity_planner::VirtualTrafficLightModulePlugin,
84
- behavior_velocity_planner::PluginInterface)
84
+ autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ class VirtualTrafficLightModuleManager : public SceneModuleManagerInterface
44
44
const autoware_auto_planning_msgs::msg::PathWithLaneId & path) override ;
45
45
};
46
46
47
- class VirtualTrafficLightModulePlugin : public PluginWrapper <VirtualTrafficLightModuleManager>
47
+ class VirtualTrafficLightModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<VirtualTrafficLightModuleManager>
48
48
{
49
49
};
50
50
Original file line number Diff line number Diff line change @@ -104,4 +104,4 @@ WalkwayModuleManager::getModuleExpiredFunction(const PathWithLaneId & path)
104
104
105
105
#include < pluginlib/class_list_macros.hpp>
106
106
PLUGINLIB_EXPORT_CLASS (
107
- behavior_velocity_planner::WalkwayModulePlugin, behavior_velocity_planner::PluginInterface)
107
+ behavior_velocity_planner::WalkwayModulePlugin, autoware:: behavior_velocity_planner::PluginInterface)
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ class WalkwayModuleManager : public SceneModuleManagerInterface
52
52
const PathWithLaneId & path) override ;
53
53
};
54
54
55
- class WalkwayModulePlugin : public PluginWrapper <WalkwayModuleManager>
55
+ class WalkwayModulePlugin : public autoware ::behavior_velocity_planner:: PluginWrapper<WalkwayModuleManager>
56
56
{
57
57
};
58
58
You can’t perform that action at this time.
0 commit comments