@@ -124,10 +124,10 @@ std::vector<PathWithLaneId> GeometricParallelParking::generatePullOverPaths(
124
124
const double L_min =
125
125
is_forward
126
126
? std::abs (
127
- parameters_.forward_parking_velocity * (parameters_.forward_parking_max_steer_angle /
127
+ parameters_.clothoid_forward_parking_velocity * (parameters_.forward_parking_max_steer_angle /
128
128
parameters_.forward_parking_steer_rate_lim ))
129
129
: std::abs (
130
- parameters_.backward_parking_velocity * (parameters_.backward_parking_max_steer_angle /
130
+ parameters_.clothoid_backward_parking_velocity * (parameters_.backward_parking_max_steer_angle /
131
131
parameters_.backward_parking_steer_rate_lim ));
132
132
arc_paths = planOneTrialClothoid (
133
133
start_pose, goal_pose, R_E_far, L_min, road_lanes, pull_over_lanes, is_forward,
@@ -218,9 +218,11 @@ bool GeometricParallelParking::planPullOver(
218
218
continue ;
219
219
}
220
220
221
+ const auto velocity = use_clothoid ? parameters_.clothoid_forward_parking_velocity
222
+ : parameters_.forward_parking_velocity ;
221
223
const auto paths = generatePullOverPaths (
222
224
*start_pose, goal_pose, R_E_far, road_lanes, pull_over_lanes, is_forward, left_side_parking,
223
- use_clothoid, end_pose_offset, parameters_. forward_parking_velocity );
225
+ use_clothoid, end_pose_offset, velocity );
224
226
if (!paths.empty ()) {
225
227
paths_ = paths;
226
228
return true ;
@@ -240,9 +242,11 @@ bool GeometricParallelParking::planPullOver(
240
242
continue ;
241
243
}
242
244
245
+ const auto velocity = use_clothoid ? parameters_.clothoid_backward_parking_velocity
246
+ : parameters_.backward_parking_velocity ;
243
247
const auto paths = generatePullOverPaths (
244
248
*start_pose, goal_pose, R_E_min_, road_lanes, pull_over_lanes, is_forward,
245
- left_side_parking, use_clothoid, end_pose_offset, parameters_. backward_parking_velocity );
249
+ left_side_parking, use_clothoid, end_pose_offset, velocity );
246
250
if (!paths.empty ()) {
247
251
paths_ = paths;
248
252
return true ;
@@ -875,11 +879,11 @@ std::vector<PathWithLaneId> GeometricParallelParking::planOneTrialClothoid(
875
879
876
880
// set terminal velocity and acceleration(temporary implementation)
877
881
if (is_forward) {
878
- pairs_terminal_velocity_and_accel_.emplace_back (parameters_.forward_parking_velocity , 0.0 );
879
- pairs_terminal_velocity_and_accel_.emplace_back (parameters_.forward_parking_velocity , 0.0 );
882
+ pairs_terminal_velocity_and_accel_.emplace_back (parameters_.clothoid_forward_parking_velocity , 0.0 );
883
+ pairs_terminal_velocity_and_accel_.emplace_back (parameters_.clothoid_forward_parking_velocity , 0.0 );
880
884
} else {
881
- pairs_terminal_velocity_and_accel_.emplace_back (parameters_.backward_parking_velocity , 0.0 );
882
- pairs_terminal_velocity_and_accel_.emplace_back (parameters_.backward_parking_velocity , 0.0 );
885
+ pairs_terminal_velocity_and_accel_.emplace_back (parameters_.clothoid_backward_parking_velocity , 0.0 );
886
+ pairs_terminal_velocity_and_accel_.emplace_back (parameters_.clothoid_backward_parking_velocity , 0.0 );
883
887
}
884
888
885
889
// set pull_over start and end pose
0 commit comments