Skip to content

Commit

Permalink
Tidy up the mess (#1243)
Browse files Browse the repository at this point in the history
  • Loading branch information
DLu authored May 12, 2022
1 parent e4c7b71 commit 924b9a1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class TimeOptimalTrajectoryGeneration : public TimeParameterization

bool computeTimeStamps(robot_trajectory::RobotTrajectory& trajectory,
const std::unordered_map<std::string, double>& velocity_limits,
const std::unordered_map<std::string, double>& acceleration_limits) const;
const std::unordered_map<std::string, double>& acceleration_limits) const override;

private:
bool doTimeParameterizationCalculations(robot_trajectory::RobotTrajectory& trajectory,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,9 @@ bool IterativeSplineParameterization::computeTimeStamps(robot_trajectory::RobotT
}

bool IterativeSplineParameterization::computeTimeStamps(
robot_trajectory::RobotTrajectory& trajectory, const std::unordered_map<std::string, double>& velocity_limits,
const std::unordered_map<std::string, double>& acceleration_limits) const
robot_trajectory::RobotTrajectory& /*trajectory*/,
const std::unordered_map<std::string, double>& /*velocity_limits*/,
const std::unordered_map<std::string, double>& /*acceleration_limits*/) const
{
RCLCPP_ERROR(LOGGER, "ISTP does not support this version of computeTimeStamps. Try TOTG instead?");
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,9 @@ bool IterativeParabolicTimeParameterization::computeTimeStamps(robot_trajectory:
}

bool IterativeParabolicTimeParameterization::computeTimeStamps(
robot_trajectory::RobotTrajectory& trajectory, const std::unordered_map<std::string, double>& velocity_limits,
const std::unordered_map<std::string, double>& acceleration_limits) const
robot_trajectory::RobotTrajectory& /*trajectory*/,
const std::unordered_map<std::string, double>& /*velocity_limits*/,
const std::unordered_map<std::string, double>& /*acceleration_limits*/) const
{
RCLCPP_ERROR(LOGGER, "IPTP does not support this version of computeTimeStamps. Try TOTG instead?");
return false;
Expand Down

0 comments on commit 924b9a1

Please sign in to comment.