Skip to content

Commit 5c2fb18

Browse files
style(pre-commit): autofix
1 parent 057a689 commit 5c2fb18

File tree

4 files changed

+45
-43
lines changed

4 files changed

+45
-43
lines changed

planning/autoware_path_optimizer/include/autoware/path_optimizer/mpt_optimizer.hpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,15 @@ class MPTOptimizer
184184
const TrajectoryParam & traj_param, const std::shared_ptr<DebugData> debug_data_ptr,
185185
const std::shared_ptr<autoware_utils::TimeKeeper> time_keeper_);
186186

187-
188-
std::pair<std::vector<ReferencePoint>, autoware::interpolation::SplineInterpolationPoints2d> calcReferencePointsAndSpline(
187+
std::pair<std::vector<ReferencePoint>, autoware::interpolation::SplineInterpolationPoints2d>
188+
calcReferencePointsAndSpline(
189189
const PlannerData & planner_data, const std::vector<TrajectoryPoint> & smoothed_points) const;
190190
void acadosCallback(
191191
const PlannerData & planner_data,
192-
const std::function<void(std::optional<std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)>& callback);
192+
const std::function<
193+
void(std::optional<
194+
std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)> &
195+
callback);
193196
std::optional<std::vector<TrajectoryPoint>> optimizeTrajectory(const PlannerData & planner_data);
194197
std::optional<std::vector<TrajectoryPoint>> getPrevOptimizedTrajectoryPoints() const;
195198

@@ -416,12 +419,15 @@ class MPTOptimizer
416419
const std::vector<TrajectoryPoint> & mpt_traj_points) const;
417420

418421
// Add new method to publish spline coefficients and curvatures
419-
void publishSplineCoefficientsAndCurvatures(
422+
void publishSplineCoefficientsAndCurvatures(
420423
const std::vector<ReferencePoint> & ref_points,
421424
const autoware::interpolation::SplineInterpolationPoints2d & ref_points_spline,
422425
const geometry_msgs::msg::Pose & ego_pose,
423426
const autoware::vehicle_info_utils::VehicleInfo & vehicle_info,
424-
const std::function<void(std::optional<std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)>& callback) const;
427+
const std::function<
428+
void(std::optional<
429+
std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)> &
430+
callback) const;
425431

426432
void publishOptimizedSteering(const Eigen::VectorXd & optimized_variables) const;
427433

planning/autoware_path_optimizer/include/autoware/path_optimizer/node.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ class PathOptimizer : public rclcpp::Node
113113
OnSetParametersCallbackHandle::SharedPtr set_param_res_;
114114

115115
void postProcessAndPublishOptimizedTrajectory(
116-
const PlannerData & planner_data,
117-
const std::vector<TrajectoryPoint> & optimized_traj_points,
116+
const PlannerData & planner_data, const std::vector<TrajectoryPoint> & optimized_traj_points,
118117
const Path::ConstSharedPtr path_ptr);
119118

120119
// subscriber callback function

planning/autoware_path_optimizer/src/mpt_optimizer.cpp

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,12 @@ void MPTOptimizer::onParam(const std::vector<rclcpp::Parameter> & parameters)
482482

483483
void MPTOptimizer::acadosCallback(
484484
const PlannerData & planner_data,
485-
const std::function<void(std::optional<std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)>& callback)
485+
const std::function<
486+
void(std::optional<
487+
std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)> &
488+
callback)
486489
{
487-
autoware_utils::ScopedTimeTrack st(__func__, *time_keeper_);
490+
autoware_utils::ScopedTimeTrack st(__func__, *time_keeper_);
488491

489492
const auto & p = planner_data;
490493
const auto & traj_points = p.traj_points;
@@ -601,7 +604,10 @@ void MPTOptimizer::publishSplineCoefficientsAndCurvatures(
601604
const autoware::interpolation::SplineInterpolationPoints2d & ref_points_spline,
602605
const geometry_msgs::msg::Pose & ego_pose,
603606
const autoware::vehicle_info_utils::VehicleInfo & vehicle_info,
604-
const std::function<void(std::optional<std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)>& callback) const
607+
const std::function<
608+
void(std::optional<
609+
std::pair<std_msgs::msg::Float32MultiArray, autoware_planning_msgs::msg::Trajectory>>)> &
610+
callback) const
605611
{
606612
// Get spline coefficients for x and y
607613
const auto & knots = ref_points_spline.getSplineKnots();
@@ -791,18 +797,19 @@ void MPTOptimizer::publishSplineCoefficientsAndCurvatures(
791797
}
792798

793799
acados_mpt_client_->async_send_request(
794-
req,
795-
[&](std::shared_future<autoware_internal_debug_msgs::srv::SplineDebug::Response::SharedPtr> future) {
796-
auto res = future.get();
797-
const auto &optimised_steering = res->optimised_steering;
798-
const auto &optimised_trajectory = res->optimised_trajectory;
799-
800-
callback(std::make_optional(std::make_pair(optimised_steering, optimised_trajectory)));
801-
}
802-
);
800+
req, [&](
801+
std::shared_future<autoware_internal_debug_msgs::srv::SplineDebug::Response::SharedPtr>
802+
future) {
803+
auto res = future.get();
804+
const auto & optimised_steering = res->optimised_steering;
805+
const auto & optimised_trajectory = res->optimised_trajectory;
806+
807+
callback(std::make_optional(std::make_pair(optimised_steering, optimised_trajectory)));
808+
});
803809
}
804810

805-
std::pair<std::vector<ReferencePoint>, autoware::interpolation::SplineInterpolationPoints2d> MPTOptimizer::calcReferencePointsAndSpline(
811+
std::pair<std::vector<ReferencePoint>, autoware::interpolation::SplineInterpolationPoints2d>
812+
MPTOptimizer::calcReferencePointsAndSpline(
806813
const PlannerData & planner_data, const std::vector<TrajectoryPoint> & smoothed_points) const
807814
{
808815
autoware_utils::ScopedTimeTrack st(__func__, *time_keeper_);

planning/autoware_path_optimizer/src/node.cpp

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ void PathOptimizer::resetPreviousData()
231231
}
232232

233233
void PathOptimizer::postProcessAndPublishOptimizedTrajectory(
234-
const PlannerData & planner_data,
235-
const std::vector<TrajectoryPoint> & optimized_traj_points,
234+
const PlannerData & planner_data, const std::vector<TrajectoryPoint> & optimized_traj_points,
236235
const Path::ConstSharedPtr path_ptr)
237236
{
238237
// 3. extend trajectory to connect the optimized trajectory and the following path smoothly
@@ -292,31 +291,22 @@ void PathOptimizer::onPath(const Path::ConstSharedPtr path_ptr)
292291
// 1. create planner data
293292
const auto planner_data = createPlannerData(*path_ptr, ego_odom_ptr);
294293
if (use_acados_) {
295-
std::function<void(
296-
std::optional<
297-
std::pair<
298-
std_msgs::msg::Float32MultiArray_<std::allocator<void>>,
299-
autoware_planning_msgs::msg::Trajectory_<std::allocator<void>>
300-
>
301-
>
302-
)> callback =
303-
[&](std::optional<
304-
std::pair<
305-
std_msgs::msg::Float32MultiArray_<std::allocator<void>>,
306-
autoware_planning_msgs::msg::Trajectory_<std::allocator<void>>
307-
>
308-
> response)
309-
{
294+
std::function<void(std::optional<std::pair<
295+
std_msgs::msg::Float32MultiArray_<std::allocator<void>>,
296+
autoware_planning_msgs::msg::Trajectory_<std::allocator<void>>>>)>
297+
callback = [&](
298+
std::optional<std::pair<
299+
std_msgs::msg::Float32MultiArray_<std::allocator<void>>,
300+
autoware_planning_msgs::msg::Trajectory_<std::allocator<void>>>>
301+
response) {
310302
if (!response.has_value()) return;
311303

312-
const auto& optimized_traj_points = response->second.points;
304+
const auto & optimized_traj_points = response->second.points;
313305

314-
postProcessAndPublishOptimizedTrajectory(
315-
planner_data, optimized_traj_points, path_ptr);
316-
};
317-
318-
} else {
306+
postProcessAndPublishOptimizedTrajectory(planner_data, optimized_traj_points, path_ptr);
307+
};
319308

309+
} else {
320310
// 2. generate optimized trajectory
321311
const auto optimized_traj_points = generateOptimizedTrajectory(planner_data);
322312

0 commit comments

Comments
 (0)