File tree 3 files changed +7
-4
lines changed
behavior_path_lane_change_module/src
behavior_path_planner/src
behavior_path_planner_common/include/behavior_path_planner_common
3 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -1253,9 +1253,9 @@ bool NormalLaneChange::getLaneChangePaths(
1253
1253
};
1254
1254
1255
1255
// get path on original lanes
1256
- const auto prepare_velocity = std::max (
1256
+ const auto prepare_velocity = std::clamp (
1257
1257
current_velocity + sampled_longitudinal_acc * prepare_duration,
1258
- minimum_lane_changing_velocity);
1258
+ minimum_lane_changing_velocity, getCommonParam (). max_vel );
1259
1259
1260
1260
// compute actual longitudinal acceleration
1261
1261
const double longitudinal_acc_on_prepare =
@@ -1319,8 +1319,9 @@ bool NormalLaneChange::getLaneChangePaths(
1319
1319
const auto lane_changing_length =
1320
1320
initial_lane_changing_velocity * lane_changing_time +
1321
1321
0.5 * longitudinal_acc_on_lane_changing * lane_changing_time * lane_changing_time;
1322
- const auto terminal_lane_changing_velocity =
1323
- initial_lane_changing_velocity + longitudinal_acc_on_lane_changing * lane_changing_time;
1322
+ const auto terminal_lane_changing_velocity = std::min (
1323
+ initial_lane_changing_velocity + longitudinal_acc_on_lane_changing * lane_changing_time,
1324
+ getCommonParam ().max_vel );
1324
1325
utils::lane_change::setPrepareVelocity (
1325
1326
prepare_segment, current_velocity, terminal_lane_changing_velocity);
1326
1327
Original file line number Diff line number Diff line change @@ -238,6 +238,7 @@ BehaviorPathPlannerParameters BehaviorPathPlannerNode::getCommonParam()
238
238
p.min_acc = declare_parameter<double >(" normal.min_acc" );
239
239
p.max_acc = declare_parameter<double >(" normal.max_acc" );
240
240
241
+ p.max_vel = declare_parameter<double >(" max_vel" );
241
242
p.backward_length_buffer_for_end_of_pull_over =
242
243
declare_parameter<double >(" backward_length_buffer_for_end_of_pull_over" );
243
244
p.backward_length_buffer_for_end_of_pull_out =
Original file line number Diff line number Diff line change @@ -42,6 +42,7 @@ struct BehaviorPathPlannerParameters
42
42
// common parameters
43
43
double min_acc;
44
44
double max_acc;
45
+ double max_vel;
45
46
46
47
double minimum_pull_over_length;
47
48
double minimum_pull_out_length;
You can’t perform that action at this time.
0 commit comments