Skip to content

Commit

Permalink
Fix typo: UnwrapToContinous => UnwrapToContinuous (#22280)
Browse files Browse the repository at this point in the history
It was spelled incorrectly in an impressive number of places, including the public (experimental) API.
  • Loading branch information
RussTedrake authored Dec 9, 2024
1 parent 744b76b commit 0809afb
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -726,11 +726,11 @@ void DefinePlanningTrajectoryOptimization(py::module m) {
py_rvp::reference_internal, cls_doc.graph_of_convex_sets.doc)
.def_static("NormalizeSegmentTimes", &Class::NormalizeSegmentTimes,
py::arg("trajectory"), cls_doc.NormalizeSegmentTimes.doc)
.def_static("UnwrapToContinousTrajectory",
&Class::UnwrapToContinousTrajectory, py::arg("gcs_trajectory"),
.def_static("UnwrapToContinuousTrajectory",
&Class::UnwrapToContinuousTrajectory, py::arg("gcs_trajectory"),
py::arg("continuous_revolute_joints"),
py::arg("starting_rounds") = std::nullopt, py::arg("tol") = 1e-8,
cls_doc.UnwrapToContinousTrajectory.doc);
cls_doc.UnwrapToContinuousTrajectory.doc);
}

m.def("GetContinuousRevoluteJointIndices", &GetContinuousRevoluteJointIndices,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ def test_gcs_trajectory_optimization_wraparound(self):
traj, result = gcs_wraparound.SolvePath(g1, g2)
self.assertTrue(result.is_success())

new_traj = GcsTrajectoryOptimization.UnwrapToContinousTrajectory(
new_traj = GcsTrajectoryOptimization.UnwrapToContinuousTrajectory(
gcs_trajectory=traj,
continuous_revolute_joints=[0],
starting_rounds=[43],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2329,7 +2329,7 @@ double UnwrapAngle(const double angle, const int round) {
} // namespace

trajectories::CompositeTrajectory<double>
GcsTrajectoryOptimization::UnwrapToContinousTrajectory(
GcsTrajectoryOptimization::UnwrapToContinuousTrajectory(
const trajectories::CompositeTrajectory<double>& gcs_trajectory,
std::vector<int> continuous_revolute_joints,
std::optional<std::vector<int>> starting_rounds, double tol) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@ class GcsTrajectoryOptimization final {
GcsTrajectoryOptimization::SolvePath() is a CompositeTrajectory of
BezierCurves.
*/
static trajectories::CompositeTrajectory<double> UnwrapToContinousTrajectory(
static trajectories::CompositeTrajectory<double> UnwrapToContinuousTrajectory(
const trajectories::CompositeTrajectory<double>& gcs_trajectory,
std::vector<int> continuous_revolute_joints,
std::optional<std::vector<int>> starting_rounds = std::nullopt,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@ GTEST_TEST(GcsTrajectoryOptimizationTest, InvalidSubspace) {
"Subspace must be a Point or HPolyhedron.");
}

GTEST_TEST(GcsTrajectoryOptimizationTest, UnwrapToContinousTrajectory) {
GTEST_TEST(GcsTrajectoryOptimizationTest, UnwrapToContinuousTrajectory) {
std::vector<copyable_unique_ptr<trajectories::Trajectory<double>>> segments;
Eigen::MatrixXd control_points_1(3, 3), control_points_2(3, 3),
control_points_3(3, 3);
Expand All @@ -1193,7 +1193,7 @@ GTEST_TEST(GcsTrajectoryOptimizationTest, UnwrapToContinousTrajectory) {
const auto traj = trajectories::CompositeTrajectory<double>(segments);
std::vector<int> continuous_revolute_joints = {1, 2};
const auto unwrapped_traj =
GcsTrajectoryOptimization::UnwrapToContinousTrajectory(
GcsTrajectoryOptimization::UnwrapToContinuousTrajectory(
traj, continuous_revolute_joints);
// Small number to shift time around discontinuity points.
const double time_eps = 1e-7;
Expand All @@ -1214,7 +1214,7 @@ GTEST_TEST(GcsTrajectoryOptimizationTest, UnwrapToContinousTrajectory) {
pos_eps));
std::vector<int> starting_rounds = {-1, 0};
const auto unwrapped_traj_with_start =
GcsTrajectoryOptimization::UnwrapToContinousTrajectory(
GcsTrajectoryOptimization::UnwrapToContinuousTrajectory(
traj, continuous_revolute_joints, starting_rounds, 1e-8);
// Check if the start is unwrapped to the correct value.
EXPECT_TRUE(CompareMatrices(unwrapped_traj_with_start.value(0.0),
Expand All @@ -1229,7 +1229,7 @@ GTEST_TEST(GcsTrajectoryOptimizationTest, UnwrapToContinousTrajectory) {
// Check for invalid start_rounds
const std::vector<int> invalid_start_rounds = {-1, 0, 1};
EXPECT_THROW(
GcsTrajectoryOptimization::UnwrapToContinousTrajectory(
GcsTrajectoryOptimization::UnwrapToContinuousTrajectory(
traj, continuous_revolute_joints, invalid_start_rounds, 1e-8),
std::runtime_error);
// Check for discontinuity for continuous revolute joints
Expand All @@ -1244,14 +1244,14 @@ GTEST_TEST(GcsTrajectoryOptimizationTest, UnwrapToContinousTrajectory) {
// unwrapping will fail.
continuous_revolute_joints = {0, 1};
DRAKE_EXPECT_THROWS_MESSAGE(
GcsTrajectoryOptimization::UnwrapToContinousTrajectory(
GcsTrajectoryOptimization::UnwrapToContinuousTrajectory(
traj_not_continous_on_revolute_manifold, continuous_revolute_joints),
".*is not a multiple of 2π at segment.*");
// If we set the tolerance to be very large, no error will occur. We use a
// tolerance of 0.6, which is larger than the 0.5 gap between adjacent
// segments.
const double loose_tol = 0.6;
EXPECT_NO_THROW(GcsTrajectoryOptimization::UnwrapToContinousTrajectory(
EXPECT_NO_THROW(GcsTrajectoryOptimization::UnwrapToContinuousTrajectory(
traj_not_continous_on_revolute_manifold, continuous_revolute_joints,
std::nullopt, loose_tol));
}
Expand All @@ -1271,7 +1271,7 @@ GTEST_TEST(GcsTrajectoryOptimizationTest, NotBezierCurveError) {
const auto traj = trajectories::CompositeTrajectory<double>(segments);
std::vector<int> continuous_revolute_joints = {0};
DRAKE_EXPECT_THROWS_MESSAGE(
GcsTrajectoryOptimization::UnwrapToContinousTrajectory(
GcsTrajectoryOptimization::UnwrapToContinuousTrajectory(
traj, continuous_revolute_joints),
".*BezierCurve<double>.*");
}
Expand Down

0 comments on commit 0809afb

Please sign in to comment.