Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exit loop when position can't change. #2307

Merged
merged 1 commit into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,12 @@ Trajectory::Trajectory(const Path& path, const Eigen::VectorXd& max_velocity, co
, time_step_(time_step)
, cached_time_(std::numeric_limits<double>::max())
{
if (time_step_ == 0)
{
valid_ = false;
RCLCPP_ERROR(LOGGER, "The trajectory is invalid because the time step is 0.");
return;
}
trajectory_.push_back(TrajectoryStep(0.0, 0.0));
double after_acceleration = getMinMaxPathAcceleration(0.0, 0.0, true);
while (valid_ && !integrateForward(trajectory_, after_acceleration) && valid_)
Expand Down Expand Up @@ -566,6 +572,16 @@ bool Trajectory::integrateForward(std::list<TrajectoryStep>& trajectory, double
trajectory.push_back(TrajectoryStep(path_pos, path_vel));
acceleration = getMinMaxPathAcceleration(path_pos, path_vel, true);

if (path_vel == 0 && acceleration == 0)
sea-bass marked this conversation as resolved.
Show resolved Hide resolved
{
// The position will never change if velocity and acceleration are zero.
// The loop will spin indefinitely as no exit condition is met.
valid_ = false;
RCLCPP_ERROR(LOGGER, "Error while integrating forward: zero acceleration and velocity. Are any relevant "
"acceleration components limited to zero?");
return true;
}

if (path_vel > getAccelerationMaxPathVelocity(path_pos) || path_vel > getVelocityMaxPathVelocity(path_pos))
{
// Find more accurate intersection with max-velocity curve using bisection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,36 @@ TEST(time_optimal_trajectory_generation, testSingleDofDiscontinuity)
}
}

TEST(time_optimal_trajectory_generation, testRelevantZeroMaxAccelerationsInvalidateTrajectory)
{
const Eigen::Vector2d max_velocity(1, 1);
const Path path(std::list<Eigen::VectorXd>{ Eigen::Vector2d(0, 0), Eigen::Vector2d(1, 1) });

EXPECT_FALSE(Trajectory(path, max_velocity, /*max_acceleration=*/Eigen::Vector2d(0, 1)).isValid());
EXPECT_FALSE(Trajectory(path, max_velocity, /*max_acceleration=*/Eigen::Vector2d(1, 0)).isValid());
EXPECT_FALSE(Trajectory(path, max_velocity, /*max_acceleration=*/Eigen::Vector2d(0, 0)).isValid());
}

TEST(time_optimal_trajectory_generation, testIrrelevantZeroMaxAccelerationsDontInvalidateTrajectory)
{
const Eigen::Vector2d max_velocity(1, 1);

EXPECT_TRUE(Trajectory(Path(std::list<Eigen::VectorXd>{ Eigen::Vector2d(0, 0), Eigen::Vector2d(0, 1) }), max_velocity,
/*max_acceleration=*/Eigen::Vector2d(0, 1))
.isValid());
EXPECT_TRUE(Trajectory(Path(std::list<Eigen::VectorXd>{ Eigen::Vector2d(0, 0), Eigen::Vector2d(1, 0) }), max_velocity,
/*max_acceleration=*/Eigen::Vector2d(1, 0))
.isValid());
}

TEST(time_optimal_trajectory_generation, testTimeStepZeroMakesTrajectoryInvalid)
{
EXPECT_FALSE(Trajectory(Path(std::list<Eigen::VectorXd>{ Eigen::Vector2d(0, 0), Eigen::Vector2d(1, 1) }),
/*max_velocity=*/Eigen::Vector2d(1, 1), /*max_acceleration=*/Eigen::Vector2d(1, 1),
/*time_step=*/0)
.isValid());
}

int main(int argc, char** argv)
{
testing::InitGoogleTest(&argc, argv);
Expand Down
Loading