Skip to content

Commit 36687f1

Browse files
yamazakiTasukuyamazakiTasukupre-commit-ci[bot]
authored
refactor(pure_pursuit): delete default values (#2942)
* delete param Signed-off-by: yamazakiTasuku <tasuku.yamazaki@tier4.jp> * style(pre-commit): autofix --------- Signed-off-by: yamazakiTasuku <tasuku.yamazaki@tier4.jp> Co-authored-by: yamazakiTasuku <tasuku.yamazaki@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent a2b2fcb commit 36687f1

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

control/pure_pursuit/src/pure_pursuit/pure_pursuit_lateral_controller.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,25 @@ PurePursuitLateralController::PurePursuitLateralController(rclcpp::Node & node)
6767
param_.max_steering_angle = vehicle_info.max_steer_angle_rad;
6868

6969
// Algorithm Parameters
70-
param_.ld_velocity_ratio = node_->declare_parameter<double>("ld_velocity_ratio", 2.4);
71-
param_.ld_lateral_error_ratio = node_->declare_parameter<double>("ld_lateral_error_ratio", 3.6);
72-
param_.ld_curvature_ratio = node_->declare_parameter<double>("ld_curvature_ratio", 120.0);
70+
param_.ld_velocity_ratio = node_->declare_parameter<double>("ld_velocity_ratio");
71+
param_.ld_lateral_error_ratio = node_->declare_parameter<double>("ld_lateral_error_ratio");
72+
param_.ld_curvature_ratio = node_->declare_parameter<double>("ld_curvature_ratio");
7373
param_.long_ld_lateral_error_threshold =
74-
node_->declare_parameter<double>("long_ld_lateral_error_threshold", 0.5);
75-
param_.min_lookahead_distance = node_->declare_parameter<double>("min_lookahead_distance", 4.35);
76-
param_.max_lookahead_distance = node_->declare_parameter<double>("max_lookahead_distance", 15.0);
74+
node_->declare_parameter<double>("long_ld_lateral_error_threshold");
75+
param_.min_lookahead_distance = node_->declare_parameter<double>("min_lookahead_distance");
76+
param_.max_lookahead_distance = node_->declare_parameter<double>("max_lookahead_distance");
7777
param_.reverse_min_lookahead_distance =
78-
node_->declare_parameter<double>("reverse_min_lookahead_distance", 7.0);
79-
param_.converged_steer_rad_ = node_->declare_parameter<double>("converged_steer_rad", 0.1);
80-
param_.prediction_ds = node_->declare_parameter<double>("prediction_ds", 0.3);
78+
node_->declare_parameter<double>("reverse_min_lookahead_distance");
79+
param_.converged_steer_rad_ = node_->declare_parameter<double>("converged_steer_rad");
80+
param_.prediction_ds = node_->declare_parameter<double>("prediction_ds");
8181
param_.prediction_distance_length =
82-
node_->declare_parameter<double>("prediction_distance_length", 21.0);
83-
param_.resampling_ds = node_->declare_parameter<double>("resampling_ds", 0.1);
82+
node_->declare_parameter<double>("prediction_distance_length");
83+
param_.resampling_ds = node_->declare_parameter<double>("resampling_ds");
8484
param_.curvature_calculation_distance =
85-
node_->declare_parameter<double>("curvature_calculation_distance", 4.0);
86-
param_.enable_path_smoothing = node_->declare_parameter<bool>("enable_path_smoothing", true);
85+
node_->declare_parameter<double>("curvature_calculation_distance");
86+
param_.enable_path_smoothing = node_->declare_parameter<bool>("enable_path_smoothing");
8787
param_.path_filter_moving_ave_num =
88-
node_->declare_parameter<int64_t>("path_filter_moving_ave_num", 25);
88+
node_->declare_parameter<int64_t>("path_filter_moving_ave_num");
8989

9090
// Debug Publishers
9191
pub_debug_marker_ =

control/pure_pursuit/src/pure_pursuit/pure_pursuit_node.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,13 @@ PurePursuitNode::PurePursuitNode(const rclcpp::NodeOptions & node_options)
6363
param_.wheel_base = vehicle_info.wheel_base_m;
6464

6565
// Node Parameters
66-
param_.ctrl_period = this->declare_parameter<double>("control_period", 0.02);
66+
param_.ctrl_period = this->declare_parameter<double>("control_period");
6767

6868
// Algorithm Parameters
69-
param_.lookahead_distance_ratio =
70-
this->declare_parameter<double>("lookahead_distance_ratio", 2.2);
71-
param_.min_lookahead_distance = this->declare_parameter<double>("min_lookahead_distance", 2.5);
69+
param_.lookahead_distance_ratio = this->declare_parameter<double>("lookahead_distance_ratio");
70+
param_.min_lookahead_distance = this->declare_parameter<double>("min_lookahead_distance");
7271
param_.reverse_min_lookahead_distance =
73-
this->declare_parameter<double>("reverse_min_lookahead_distance", 7.0);
72+
this->declare_parameter<double>("reverse_min_lookahead_distance");
7473

7574
// Subscribers
7675
using std::placeholders::_1;

0 commit comments

Comments
 (0)