From 5d3883d0d1e6118888b2118e65498030a34702c7 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Thu, 10 Jun 2021 00:13:07 +0900 Subject: [PATCH] Add use foa option (#106) * Add use foa option Signed-off-by: wep21 * Fix typo Signed-off-by: wep21 * Cosmetic change Signed-off-by: wep21 --- autoware_launch/launch/autoware.launch.xml | 2 ++ .../launch/logging_simulator.launch.xml | 2 ++ .../launch/planning_simulator.launch.xml | 2 ++ .../obstacle_avoidance_planner.param.yaml | 4 ++-- planning_launch/launch/planning.launch.xml | 4 ++++ .../behavior_planning.launch.py | 14 ++++++++------ .../behavior_planning.launch.xml | 16 +++++++++------- .../motion_planning/motion_planning.launch.py | 1 + .../motion_planning/motion_planning.launch.xml | 1 + 9 files changed, 31 insertions(+), 15 deletions(-) diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml index b36abfc84..e0e939fde 100644 --- a/autoware_launch/launch/autoware.launch.xml +++ b/autoware_launch/launch/autoware.launch.xml @@ -8,6 +8,7 @@ + @@ -53,6 +54,7 @@ + diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml index ca1784889..c48fd5b22 100644 --- a/autoware_launch/launch/logging_simulator.launch.xml +++ b/autoware_launch/launch/logging_simulator.launch.xml @@ -19,6 +19,7 @@ + @@ -83,6 +84,7 @@ + diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml index 3e1308905..6be63c800 100644 --- a/autoware_launch/launch/planning_simulator.launch.xml +++ b/autoware_launch/launch/planning_simulator.launch.xml @@ -15,6 +15,7 @@ + @@ -58,6 +59,7 @@ + diff --git a/planning_launch/config/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner/obstacle_avoidance_planner.param.yaml b/planning_launch/config/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner/obstacle_avoidance_planner.param.yaml index 809eb19c6..18e99272d 100644 --- a/planning_launch/config/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner/obstacle_avoidance_planner.param.yaml +++ b/planning_launch/config/scenario_planning/lane_driving/motion_planning/obstacle_avoidance_planner/obstacle_avoidance_planner.param.yaml @@ -14,7 +14,7 @@ # clearance for unique points clearance_for_straight_line: 0.05 # minimum optimizing range around straight points clearance_for_joint: 0.1 # minimum optimizing range around joint points - clearance_for_only_smoothing: 0.1 # minimum optimizing range when applygin only smoothing + clearance_for_only_smoothing: 0.1 # minimum optimizing range when applying only smoothing range_for_extend_joint: 0.1 # minimum optimizing range around joint points for extending clearance_from_object_for_straight: 10.0 # minimum clearance from object when judging straight line @@ -44,7 +44,7 @@ is_publishing_clearance_map: true # publish clearance map as nav_msgs::OccupancyGrid is_publishing_area_with_objects: true # publish occupancy map as nav_msgs::OccupancyGrid - enable_avoidance: false # enable avoidance function + # enable_avoidance: false # enable avoidance function is_using_vehicle_config: true # use vehicle config num_sampling_points: 100 # number of optimizing points num_joint_buffer_points: 3 # number of joint buffer points diff --git a/planning_launch/launch/planning.launch.xml b/planning_launch/launch/planning.launch.xml index 003af6fca..76151717b 100644 --- a/planning_launch/launch/planning.launch.xml +++ b/planning_launch/launch/planning.launch.xml @@ -1,6 +1,10 @@ + + + + diff --git a/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.py b/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.py index f35986b09..084b427d7 100644 --- a/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.py +++ b/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.py @@ -67,11 +67,11 @@ def generate_launch_description(): parameters=[ lane_change_planner_param, { - 'enable_abort_lane_change': False, - 'enable_collision_check_at_prepare_phase': False, - 'use_predicted_path_outside_lanelet': False, - 'use_all_predicted_path': False, - 'enable_blocked_by_obstacle': False, + 'enable_abort_lane_change': LaunchConfiguration('disuse_foa'), + 'enable_collision_check_at_prepare_phase': LaunchConfiguration('disuse_foa'), + 'use_predicted_path_outside_lanelet': LaunchConfiguration('disuse_foa'), + 'use_all_predicted_path': LaunchConfiguration('disuse_foa'), + 'enable_blocked_by_obstacle': LaunchConfiguration('disuse_foa'), } ], extra_arguments=[ @@ -240,5 +240,7 @@ def generate_launch_description(): cmd=['ros2', 'topic', 'pub', '/planning/scenario_planning/lane_driving/lane_change_approval', 'autoware_planning_msgs/msg/LaneChangeCommand', '{command: true}', - '-r', '10']), + '-r', '10'], + condition=IfCondition(LaunchConfiguration('disuse_foa')) + ), ]) diff --git a/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml b/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml index 708fe5158..7ef336ac5 100644 --- a/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml +++ b/planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml @@ -15,15 +15,17 @@ - - - - - + + + + + - + + + diff --git a/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.py b/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.py index 5abfdbfc6..6313ef0ca 100644 --- a/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.py +++ b/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.py @@ -52,6 +52,7 @@ def generate_launch_description(): ], parameters=[ obstacle_avoidance_planner_param, + {'enable_avoidance': LaunchConfiguration('disuse_foa')}, {'is_showing_debug_info': False}, {'is_stopping_if_outside_drivable_area': True}, ], diff --git a/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml b/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml index 05892f5a2..7bf68aa96 100644 --- a/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml +++ b/planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml @@ -4,6 +4,7 @@ +