From feb4db171e0c776205c542ab54a8ea50c352c09d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 04:58:58 +0000 Subject: [PATCH] ci(pre-commit): autofix --- .../src/scene_module/lane_change/lane_change_module.cpp | 6 ++---- .../src/scene_module/lane_change/util.cpp | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/planning/behavior_path_planner/src/scene_module/lane_change/lane_change_module.cpp b/planning/behavior_path_planner/src/scene_module/lane_change/lane_change_module.cpp index d13ed7d93b534..ff28e889620de 100644 --- a/planning/behavior_path_planner/src/scene_module/lane_change/lane_change_module.cpp +++ b/planning/behavior_path_planner/src/scene_module/lane_change/lane_change_module.cpp @@ -174,7 +174,6 @@ BehaviorModuleOutput LaneChangeModule::plan() CandidateOutput LaneChangeModule::planCandidate() const { - // Get lane change lanes const auto current_lanes = getCurrentLanes(); const auto lane_change_lanes = getLaneChangeLanes(current_lanes, lane_change_lane_length_); @@ -395,7 +394,6 @@ std::pair LaneChangeModule::getSafePath( // object_debug_ = object_debug; setObjectDebugVisualization(); - return std::make_pair(true, found_safe_path); } @@ -464,8 +462,8 @@ bool LaneChangeModule::isAbortConditionSatisfied() const std::unordered_map debug_data; is_path_safe = lane_change_utils::isLaneChangePathSafe( path.path, current_lanes, check_lanes, objects, current_pose, current_twist, - common_parameters.vehicle_width, common_parameters.vehicle_length, parameters_, debug_data, false, - status_.lane_change_path.acceleration); + common_parameters.vehicle_width, common_parameters.vehicle_length, parameters_, debug_data, + false, status_.lane_change_path.acceleration); } // check vehicle velocity thresh diff --git a/planning/behavior_path_planner/src/scene_module/lane_change/util.cpp b/planning/behavior_path_planner/src/scene_module/lane_change/util.cpp index 56f0936f2ebd4..d27e1d7da3fd3 100644 --- a/planning/behavior_path_planner/src/scene_module/lane_change/util.cpp +++ b/planning/behavior_path_planner/src/scene_module/lane_change/util.cpp @@ -13,9 +13,9 @@ // limitations under the License. #include "behavior_path_planner/scene_module/lane_change/util.hpp" -#include "behavior_path_planner/scene_module/avoidance/avoidance_utils.hpp" #include "behavior_path_planner/path_shifter/path_shifter.hpp" +#include "behavior_path_planner/scene_module/avoidance/avoidance_utils.hpp" #include #include @@ -448,7 +448,7 @@ bool isLaneChangePathSafe( if (boost::geometry::overlaps(ego_polygon, obj_polygon)) { appendDebugInfo(debug_datum, "OverlapInCurrent", false); - return false; + return false; } const auto & object_twist = obj.kinematics.initial_twist_with_covariance.twist; @@ -482,7 +482,7 @@ bool isLaneChangePathSafe( if (is_object_in_target) { for (const auto & obj_path : predicted_paths) { - std::vector lerp_ego_pose {}; + std::vector lerp_ego_pose{}; for (double t = target_lane_check_start_time; t < target_lane_check_end_time; t += time_resolution) { Pose expected_obj_pose; @@ -502,7 +502,6 @@ bool isLaneChangePathSafe( continue; } - lerp_ego_pose.push_back(expected_ego_pose); if (boost::geometry::overlaps(ego_polygon, obj_polygon)) { debug_datum.second.lerped_path = lerp_ego_pose;