Skip to content

Commit

Permalink
add prefix to new change
Browse files Browse the repository at this point in the history
Signed-off-by: kosuke55 <[email protected]>
  • Loading branch information
kosuke55 authored and esteve committed Sep 4, 2024
1 parent 5bb5903 commit e321949
Showing 1 changed file with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ std::optional<double> AccelMap::getThrottle(const double acc, double vel) const

// (throttle, vel, acc) map => (throttle, acc) map by fixing vel
for (std::vector<double> accelerations : accel_map) {
interpolated_acc_vec.push_back(interpolation::lerp(vel_indices, accelerations, clamped_vel));
interpolated_acc_vec.push_back(
autoware::interpolation::lerp(vel_indices, accelerations, clamped_vel));
}

// calculate throttle
Expand All @@ -74,7 +75,7 @@ std::optional<double> AccelMap::getThrottle(const double acc, double vel) const
return throttle_indices.back();
}

return interpolation::lerp(interpolated_acc_vec, throttle_indices, acc);
return autoware::interpolation::lerp(interpolated_acc_vec, throttle_indices, acc);
}

double BrakeMap::getBrake(const double acc, double vel) const
Expand All @@ -88,7 +89,8 @@ double BrakeMap::getBrake(const double acc, double vel) const

// (brake, vel, acc) map => (brake, acc) map by fixing vel
for (std::vector<double> accelerations : brake_map) {
interpolated_acc_vec.push_back(interpolation::lerp(vel_indices, accelerations, clamped_vel));
interpolated_acc_vec.push_back(
autoware::interpolation::lerp(vel_indices, accelerations, clamped_vel));
}

// calculate brake
Expand All @@ -101,7 +103,7 @@ double BrakeMap::getBrake(const double acc, double vel) const
}

std::reverse(std::begin(interpolated_acc_vec), std::end(interpolated_acc_vec));
return interpolation::lerp(interpolated_acc_vec, brake_indices, acc);
return autoware::interpolation::lerp(interpolated_acc_vec, brake_indices, acc);
}

// steer map sim model
Expand Down

0 comments on commit e321949

Please sign in to comment.