diff --git a/photon-core/src/main/java/org/photonvision/vision/calibration/UICameraCalibrationCoefficients.java b/photon-core/src/main/java/org/photonvision/vision/calibration/UICameraCalibrationCoefficients.java index c02d48d15..123b1063d 100644 --- a/photon-core/src/main/java/org/photonvision/vision/calibration/UICameraCalibrationCoefficients.java +++ b/photon-core/src/main/java/org/photonvision/vision/calibration/UICameraCalibrationCoefficients.java @@ -52,7 +52,7 @@ public class UICameraCalibrationCoefficients extends CameraCalibrationCoefficien .map( it2 -> it2.reprojectionErrors.stream() - .mapToDouble(it -> Math.sqrt(it.x * it.x + it.y * it.y)) + .mapToDouble(it -> Math.hypot(it.x, it.y)) .average() .orElse(0)) .toList(); diff --git a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/CornerDetectionPipe.java b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/CornerDetectionPipe.java index def6aeda1..5508154b0 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/CornerDetectionPipe.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/CornerDetectionPipe.java @@ -85,9 +85,7 @@ public class CornerDetectionPipe * @return The straight line distance between them. */ private static double distanceBetween(Point a, Point b) { - double xDelta = a.x - b.x; - double yDelta = a.y - b.y; - return Math.sqrt(xDelta * xDelta + yDelta * yDelta); + return Math.hypot(a.x - b.x, a.y - b.y); } /** diff --git a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FindBoardCornersPipe.java b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FindBoardCornersPipe.java index 357782a21..fb2dd3b8b 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FindBoardCornersPipe.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FindBoardCornersPipe.java @@ -170,9 +170,7 @@ public class FindBoardCornersPipe // +1 idx Neighbor distance double[] startPoint = inPoints.get(pointIdx, 0); double[] endPoint = inPoints.get(pointIdx + 1, 0); - double deltaX = startPoint[0] - endPoint[0]; - double deltaY = startPoint[1] - endPoint[1]; - double distToNext = Math.sqrt(deltaX * deltaX + deltaY * deltaY); + double distToNext = Math.hypot(startPoint[0] - endPoint[0], startPoint[1] - endPoint[1]); minSpacing = Math.min(distToNext, minSpacing); } diff --git a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/SortContoursPipe.java b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/SortContoursPipe.java index e9abc1ae9..8be3116bd 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/SortContoursPipe.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/SortContoursPipe.java @@ -51,9 +51,9 @@ public class SortContoursPipe } private double calcSquareCenterDistance(PotentialTarget tgt) { - return Math.sqrt( - Math.pow(params.frameStaticProperties().centerX - tgt.getMinAreaRect().center.x, 2) - + Math.pow(params.frameStaticProperties().centerY - tgt.getMinAreaRect().center.y, 2)); + return Math.hypot( + params.frameStaticProperties().centerX - tgt.getMinAreaRect().center.x, + params.frameStaticProperties().centerY - tgt.getMinAreaRect().center.y); } public static record SortContoursParams( diff --git a/photon-lib/src/main/java/org/photonvision/simulation/SimCameraProperties.java b/photon-lib/src/main/java/org/photonvision/simulation/SimCameraProperties.java index eb6414145..7e806e159 100644 --- a/photon-lib/src/main/java/org/photonvision/simulation/SimCameraProperties.java +++ b/photon-lib/src/main/java/org/photonvision/simulation/SimCameraProperties.java @@ -171,7 +171,7 @@ public class SimCameraProperties { DriverStation.reportError( "Requested invalid FOV! Clamping between (1, 179) degrees...", false); } - double resDiag = Math.sqrt(resWidth * resWidth + resHeight * resHeight); + double resDiag = Math.hypot(resWidth, resHeight); double diagRatio = Math.tan(fovDiag.getRadians() / 2); var fovWidth = new Rotation2d(Math.atan(diagRatio * (resWidth / resDiag)) * 2); var fovHeight = new Rotation2d(Math.atan(diagRatio * (resHeight / resDiag)) * 2);