Skip to content

Commit ac483b9

Browse files
authored
refactor(out_of_lane): remove from behavior_velocity (#7359)
Signed-off-by: Maxime CLEMENT <maxime.clement@tier4.jp>
1 parent 240c976 commit ac483b9

33 files changed

+2
-2599
lines changed

.github/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ planning/behavior_velocity_intersection_module/** kyoichi.sugahara@tier4.jp mamo
178178
planning/behavior_velocity_no_drivable_lane_module/** ahmed.ebrahim@leodrive.ai fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
179179
planning/behavior_velocity_no_stopping_area_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
180180
planning/behavior_velocity_occlusion_spot_module/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
181-
planning/behavior_velocity_out_of_lane_module/** maxime.clement@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
182181
planning/autoware_behavior_velocity_planner_common/** fumiya.watanabe@tier4.jp isamu.takagi@tier4.jp mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
183182
planning/autoware_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
184183
planning/behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp

launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml

-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<arg name="launch_occlusion_spot_module" default="true"/>
3333
<arg name="launch_run_out_module" default="true"/>
3434
<arg name="launch_speed_bump_module" default="true"/>
35-
<arg name="launch_out_of_lane_module" default="true"/>
3635
<arg name="launch_no_drivable_lane_module" default="true"/>
3736
<arg name="launch_dynamic_obstacle_stop_module" default="true"/>
3837

@@ -164,11 +163,6 @@
164163
value="$(eval &quot;'$(var behavior_velocity_planner_launch_modules)' + 'autoware::behavior_velocity_planner::SpeedBumpModulePlugin, '&quot;)"
165164
if="$(var launch_speed_bump_module)"
166165
/>
167-
<let
168-
name="behavior_velocity_planner_launch_modules"
169-
value="$(eval &quot;'$(var behavior_velocity_planner_launch_modules)' + 'autoware::behavior_velocity_planner::OutOfLaneModulePlugin, '&quot;)"
170-
if="$(var launch_out_of_lane_module)"
171-
/>
172166
<let
173167
name="behavior_velocity_planner_launch_modules"
174168
value="$(eval &quot;'$(var behavior_velocity_planner_launch_modules)' + 'autoware::behavior_velocity_planner::NoDrivableLaneModulePlugin, '&quot;)"
@@ -261,7 +255,6 @@
261255
<param from="$(var behavior_velocity_planner_no_stopping_area_module_param_path)"/>
262256
<param from="$(var behavior_velocity_planner_run_out_module_param_path)"/>
263257
<param from="$(var behavior_velocity_planner_speed_bump_module_param_path)"/>
264-
<param from="$(var behavior_velocity_planner_out_of_lane_module_param_path)"/>
265258
<param from="$(var behavior_velocity_planner_no_drivable_lane_module_param_path)"/>
266259
<param from="$(var behavior_velocity_planner_dynamic_obstacle_stop_module_param_path)"/>
267260
<!-- composable node config -->

launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<arg name="interface_input_topic" default="/planning/scenario_planning/lane_driving/behavior_planning/path"/>
33
<arg name="interface_output_topic" default="/planning/scenario_planning/lane_driving/trajectory"/>
44

5-
<arg name="launch_motion_out_of_lane_module" default="true"/>
5+
<arg name="launch_out_of_lane_module" default="true"/>
66
<!-- <arg name="launch_dynamic_obstacle_stop_module" default="true"/> -->
77
<arg name="launch_module_list_end" default="&quot;&quot;]"/>
88

@@ -11,7 +11,7 @@
1111
<let
1212
name="motion_velocity_planner_launch_modules"
1313
value="$(eval &quot;'$(var motion_velocity_planner_launch_modules)' + 'autoware::motion_velocity_planner::OutOfLaneModule, '&quot;)"
14-
if="$(var launch_motion_out_of_lane_module)"
14+
if="$(var launch_out_of_lane_module)"
1515
/>
1616
<!-- <let -->
1717
<!-- name="motion_velocity_planner_launch_modules" -->

planning/.pages

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ nav:
2929
- 'No Drivable Lane': planning/behavior_velocity_no_drivable_lane_module
3030
- 'No Stopping Area': planning/behavior_velocity_no_stopping_area_module
3131
- 'Occlusion Spot': planning/behavior_velocity_occlusion_spot_module
32-
- 'Out of Lane': planning/behavior_velocity_out_of_lane_module
3332
- 'Run Out': planning/autoware_behavior_velocity_run_out_module
3433
- 'Speed Bump': planning/behavior_velocity_speed_bump_module
3534
- 'Stop Line': planning/behavior_velocity_stop_line_module

planning/autoware_behavior_velocity_planner/launch/behavior_velocity_planner.launch.xml

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<arg name="behavior_velocity_planner_no_stopping_area_module_param_path"/>
2525
<arg name="behavior_velocity_planner_run_out_module_param_path"/>
2626
<arg name="behavior_velocity_planner_speed_bump_module_param_path"/>
27-
<arg name="behavior_velocity_planner_out_of_lane_module_param_path"/>
2827
<arg name="behavior_velocity_planner_no_drivable_lane_module_param_path"/>
2928
<arg name="behavior_velocity_planner_dynamic_obstacle_stop_module_param_path"/>
3029
<!-- <arg name="behavior_velocity_planner_template_module_param_path"/> -->
@@ -68,7 +67,6 @@
6867
<param from="$(var behavior_velocity_planner_no_stopping_area_module_param_path)"/>
6968
<param from="$(var behavior_velocity_planner_run_out_module_param_path)"/>
7069
<param from="$(var behavior_velocity_planner_speed_bump_module_param_path)"/>
71-
<param from="$(var behavior_velocity_planner_out_of_lane_module_param_path)"/>
7270
<param from="$(var behavior_velocity_planner_no_drivable_lane_module_param_path)"/>
7371
<param from="$(var behavior_velocity_planner_dynamic_obstacle_stop_module_param_path)"/>
7472
<!-- <param from="$(var behavior_velocity_planner_template_param_path)"/> -->

planning/autoware_behavior_velocity_planner/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<test_depend>behavior_velocity_no_drivable_lane_module</test_depend>
7777
<test_depend>behavior_velocity_no_stopping_area_module</test_depend>
7878
<test_depend>behavior_velocity_occlusion_spot_module</test_depend>
79-
<test_depend>behavior_velocity_out_of_lane_module</test_depend>
8079
<test_depend>behavior_velocity_speed_bump_module</test_depend>
8180
<test_depend>behavior_velocity_stop_line_module</test_depend>
8281
<test_depend>behavior_velocity_traffic_light_module</test_depend>

planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ std::shared_ptr<BehaviorVelocityPlannerNode> generateNode()
8181
module_names.emplace_back("autoware::behavior_velocity_planner::OcclusionSpotModulePlugin");
8282
module_names.emplace_back("autoware::behavior_velocity_planner::RunOutModulePlugin");
8383
module_names.emplace_back("autoware::behavior_velocity_planner::SpeedBumpModulePlugin");
84-
module_names.emplace_back("autoware::behavior_velocity_planner::OutOfLaneModulePlugin");
8584
module_names.emplace_back("autoware::behavior_velocity_planner::NoDrivableLaneModulePlugin");
8685

8786
std::vector<rclcpp::Parameter> params;
@@ -108,7 +107,6 @@ std::shared_ptr<BehaviorVelocityPlannerNode> generateNode()
108107
get_behavior_velocity_module_config_no_prefix("stop_line"),
109108
get_behavior_velocity_module_config_no_prefix("traffic_light"),
110109
get_behavior_velocity_module_config("virtual_traffic_light"),
111-
get_behavior_velocity_module_config_no_prefix("out_of_lane"),
112110
get_behavior_velocity_module_config_no_prefix("no_drivable_lane")});
113111

114112
// TODO(Takagi, Isamu): set launch_modules

planning/behavior_velocity_out_of_lane_module/CMakeLists.txt

-12
This file was deleted.

planning/behavior_velocity_out_of_lane_module/README.md

-165
This file was deleted.

0 commit comments

Comments
 (0)