Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 2027

Browse Source
This commit is contained in:
Peter Johnson
2025-06-13 22:26:09 -07:00
parent fbee476fd2 05c080328b
commit 3355383fe9
13 changed files with 1031 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
wpimath/src/test/java/edu/wpi/first/math/geometry/Pose3dTest.java
View File

@@ -324,4 +324,71 @@ class Pose3dTest {
() -> assertFalse(((Double) twist.rz).isNaN()));
}
}
@Test
void testNearest() {
var origin = Pose3d.kZero;
// Distance sort
// poses are in order of closest to farthest away from the origin at various positions in 3D
// space.
final var pose1 = new Pose3d(1, 0, 0, Rotation3d.kZero);
final var pose2 = new Pose3d(0, 2, 0, Rotation3d.kZero);
final var pose3 = new Pose3d(0, 0, 3, Rotation3d.kZero);
final var pose4 = new Pose3d(2, 2, 2, Rotation3d.kZero);
final var pose5 = new Pose3d(3, 3, 3, Rotation3d.kZero);
assertEquals(pose3, origin.nearest(List.of(pose5, pose3, pose4)));
assertEquals(pose1, origin.nearest(List.of(pose1, pose2, pose3)));
assertEquals(pose2, origin.nearest(List.of(pose4, pose2, pose3)));
// Rotation component sort (when distance is the same)
// Use the same translation to avoid distance differences
final var translation = new Translation3d(1, 0, 0);
final var poseA = new Pose3d(translation, Rotation3d.kZero); // No rotation
final var poseB = new Pose3d(translation, new Rotation3d(Math.toRadians(30), 0, 0));
final var poseC = new Pose3d(translation, new Rotation3d(0, Math.toRadians(45), 0));
final var poseD = new Pose3d(translation, new Rotation3d(0, 0, Math.toRadians(90)));
final var poseE = new Pose3d(translation, new Rotation3d(Math.toRadians(180), 0, 0));
assertEquals(
poseA, new Pose3d(0, 0, 0, Rotation3d.kZero).nearest(List.of(poseA, poseB, poseD)));
assertEquals(
poseB,
new Pose3d(0, 0, 0, new Rotation3d(Math.toRadians(25), 0, 0))
.nearest(List.of(poseB, poseC, poseD)));
assertEquals(
poseC,
new Pose3d(0, 0, 0, new Rotation3d(0, Math.toRadians(50), 0))
.nearest(List.of(poseB, poseC, poseD)));
assertEquals(
poseD,
new Pose3d(0, 0, 0, new Rotation3d(0, 0, Math.toRadians(85)))
.nearest(List.of(poseA, poseC, poseD)));
assertEquals(
poseE,
new Pose3d(0, 0, 0, new Rotation3d(Math.toRadians(170), 0, 0))
.nearest(List.of(poseA, poseD, poseE)));
// Test with complex 3D rotations (combining roll, pitch, yaw)
final var complexPose1 =
new Pose3d(
translation,
new Rotation3d(Math.toRadians(45), Math.toRadians(30), Math.toRadians(60)));
final var complexPose2 =
new Pose3d(
translation,
new Rotation3d(Math.toRadians(90), Math.toRadians(45), Math.toRadians(90)));
final var complexPose3 =
new Pose3d(
translation,
new Rotation3d(Math.toRadians(10), Math.toRadians(15), Math.toRadians(20)));
assertEquals(
complexPose3,
new Pose3d(
0, 0, 0, new Rotation3d(Math.toRadians(5), Math.toRadians(10), Math.toRadians(15)))
.nearest(List.of(complexPose1, complexPose2, complexPose3)));
}
}

19
wpimath/src/test/java/edu/wpi/first/math/geometry/Translation3dTest.java
View File

@@ -11,6 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
import edu.wpi.first.math.VecBuilder;
import edu.wpi.first.math.util.Units;
import java.util.List;
import org.junit.jupiter.api.Test;
class Translation3dTest {
@@ -206,4 +207,22 @@ class Translation3dTest {
assertEquals(vec, translation.toVector());
}
@Test
void testNearest() {
var origin = Translation3d.kZero;
// Distance sort
// translations are in order of closest to farthest away from the origin at various positions
// in 3D space.
final var translation1 = new Translation3d(1, 0, 0);
final var translation2 = new Translation3d(0, 2, 0);
final var translation3 = new Translation3d(0, 0, 3);
final var translation4 = new Translation3d(2, 2, 2);
final var translation5 = new Translation3d(3, 3, 3);
assertEquals(translation3, origin.nearest(List.of(translation5, translation3, translation4)));
assertEquals(translation1, origin.nearest(List.of(translation1, translation2, translation3)));
assertEquals(translation2, origin.nearest(List.of(translation4, translation2, translation3)));
}
}

108
wpimath/src/test/native/cpp/geometry/Pose3dTest.cpp
View File

@@ -221,3 +221,111 @@ TEST(Pose3dTest, TwistNaN) {
EXPECT_FALSE(std::isnan(twist.rz.value()));
}
}
TEST(Pose3dTest, Nearest) {
const Pose3d origin{0_m, 0_m, 0_m, Rotation3d{}};
// Distance sort
// poses are in order of closest to farthest away from the origin at
// various positions in 3D space.
const Pose3d pose1{1_m, 0_m, 0_m, Rotation3d{}};
const Pose3d pose2{0_m, 2_m, 0_m, Rotation3d{}};
const Pose3d pose3{0_m, 0_m, 3_m, Rotation3d{}};
const Pose3d pose4{2_m, 2_m, 2_m, Rotation3d{}};
const Pose3d pose5{3_m, 3_m, 3_m, Rotation3d{}};
EXPECT_DOUBLE_EQ(pose3.X().value(),
origin.Nearest({pose5, pose3, pose4}).X().value());
EXPECT_DOUBLE_EQ(pose3.Y().value(),
origin.Nearest({pose5, pose3, pose4}).Y().value());
EXPECT_DOUBLE_EQ(pose3.Z().value(),
origin.Nearest({pose5, pose3, pose4}).Z().value());
EXPECT_DOUBLE_EQ(pose1.X().value(),
origin.Nearest({pose1, pose2, pose3}).X().value());
EXPECT_DOUBLE_EQ(pose1.Y().value(),
origin.Nearest({pose1, pose2, pose3}).Y().value());
EXPECT_DOUBLE_EQ(pose1.Z().value(),
origin.Nearest({pose1, pose2, pose3}).Z().value());
EXPECT_DOUBLE_EQ(pose2.X().value(),
origin.Nearest({pose4, pose2, pose3}).X().value());
EXPECT_DOUBLE_EQ(pose2.Y().value(),
origin.Nearest({pose4, pose2, pose3}).Y().value());
EXPECT_DOUBLE_EQ(pose2.Z().value(),
origin.Nearest({pose4, pose2, pose3}).Z().value());
// Rotation component sort (when distance is the same)
// Use the same translation to avoid distance differences
const Translation3d translation{1_m, 0_m, 0_m};
const Pose3d poseA{translation, Rotation3d{}}; // No rotation
const Pose3d poseB{translation, Rotation3d{30_deg, 0_deg, 0_deg}};
const Pose3d poseC{translation, Rotation3d{0_deg, 45_deg, 0_deg}};
const Pose3d poseD{translation, Rotation3d{0_deg, 0_deg, 90_deg}};
const Pose3d poseE{translation, Rotation3d{180_deg, 0_deg, 0_deg}};
auto result1 =
Pose3d{0_m, 0_m, 0_m, Rotation3d{}}.Nearest({poseA, poseB, poseD});
EXPECT_DOUBLE_EQ(poseA.Rotation().X().value(),
result1.Rotation().X().value());
EXPECT_DOUBLE_EQ(poseA.Rotation().Y().value(),
result1.Rotation().Y().value());
EXPECT_DOUBLE_EQ(poseA.Rotation().Z().value(),
result1.Rotation().Z().value());
auto result2 =
Pose3d{0_m, 0_m, 0_m, Rotation3d{25_deg, 0_deg, 0_deg}}.Nearest(
{poseB, poseC, poseD});
EXPECT_DOUBLE_EQ(poseB.Rotation().X().value(),
result2.Rotation().X().value());
EXPECT_DOUBLE_EQ(poseB.Rotation().Y().value(),
result2.Rotation().Y().value());
EXPECT_DOUBLE_EQ(poseB.Rotation().Z().value(),
result2.Rotation().Z().value());
auto result3 =
Pose3d{0_m, 0_m, 0_m, Rotation3d{0_deg, 50_deg, 0_deg}}.Nearest(
{poseB, poseC, poseD});
EXPECT_DOUBLE_EQ(poseC.Rotation().X().value(),
result3.Rotation().X().value());
EXPECT_DOUBLE_EQ(poseC.Rotation().Y().value(),
result3.Rotation().Y().value());
EXPECT_DOUBLE_EQ(poseC.Rotation().Z().value(),
result3.Rotation().Z().value());
auto result4 =
Pose3d{0_m, 0_m, 0_m, Rotation3d{0_deg, 0_deg, 85_deg}}.Nearest(
{poseA, poseC, poseD});
EXPECT_DOUBLE_EQ(poseD.Rotation().X().value(),
result4.Rotation().X().value());
EXPECT_DOUBLE_EQ(poseD.Rotation().Y().value(),
result4.Rotation().Y().value());
EXPECT_DOUBLE_EQ(poseD.Rotation().Z().value(),
result4.Rotation().Z().value());
auto result5 =
Pose3d{0_m, 0_m, 0_m, Rotation3d{170_deg, 0_deg, 0_deg}}.Nearest(
{poseA, poseD, poseE});
EXPECT_DOUBLE_EQ(poseE.Rotation().X().value(),
result5.Rotation().X().value());
EXPECT_DOUBLE_EQ(poseE.Rotation().Y().value(),
result5.Rotation().Y().value());
EXPECT_DOUBLE_EQ(poseE.Rotation().Z().value(),
result5.Rotation().Z().value());
// Test with complex 3D rotations (combining roll, pitch, yaw)
const Pose3d complexPose1{translation, Rotation3d{45_deg, 30_deg, 60_deg}};
const Pose3d complexPose2{translation, Rotation3d{90_deg, 45_deg, 90_deg}};
const Pose3d complexPose3{translation, Rotation3d{10_deg, 15_deg, 20_deg}};
auto complexResult =
Pose3d{0_m, 0_m, 0_m, Rotation3d{5_deg, 10_deg, 15_deg}}.Nearest(
{complexPose1, complexPose2, complexPose3});
EXPECT_DOUBLE_EQ(complexPose3.Rotation().X().value(),
complexResult.Rotation().X().value());
EXPECT_DOUBLE_EQ(complexPose3.Rotation().Y().value(),
complexResult.Rotation().Y().value());
EXPECT_DOUBLE_EQ(complexPose3.Rotation().Z().value(),
complexResult.Rotation().Z().value());
}

28
wpimath/src/test/native/cpp/geometry/Translation3dTest.cpp
View File

@@ -186,3 +186,31 @@ TEST(Translation3dTest, Constexpr) {
static_assert(projected.X() == 1_m);
static_assert(projected.Y() == 2_m);
}
TEST(Translation3dTest, Nearest) {
const Translation3d origin{0_m, 0_m, 0_m};
// Distance sort
// translations are in order of closest to farthest away from the origin at
// various positions in 3D space.
const Translation3d translation1{1_m, 0_m, 0_m};
const Translation3d translation2{0_m, 2_m, 0_m};
const Translation3d translation3{0_m, 0_m, 3_m};
const Translation3d translation4{2_m, 2_m, 2_m};
const Translation3d translation5{3_m, 3_m, 3_m};
auto nearest1 = origin.Nearest({translation5, translation3, translation4});
EXPECT_DOUBLE_EQ(nearest1.X().value(), translation3.X().value());
EXPECT_DOUBLE_EQ(nearest1.Y().value(), translation3.Y().value());
EXPECT_DOUBLE_EQ(nearest1.Z().value(), translation3.Z().value());
auto nearest2 = origin.Nearest({translation1, translation2, translation3});
EXPECT_DOUBLE_EQ(nearest2.X().value(), translation1.X().value());
EXPECT_DOUBLE_EQ(nearest2.Y().value(), translation1.Y().value());
EXPECT_DOUBLE_EQ(nearest2.Z().value(), translation1.Z().value());
auto nearest3 = origin.Nearest({translation4, translation2, translation3});
EXPECT_DOUBLE_EQ(nearest3.X().value(), translation2.X().value());
EXPECT_DOUBLE_EQ(nearest3.Y().value(), translation2.Y().value());
EXPECT_DOUBLE_EQ(nearest3.Z().value(), translation2.Z().value());
}