From 9f3a735c593a04a3d01619c0f609c1c389638a3b Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Tue, 12 Sep 2023 06:57:01 -0400 Subject: [PATCH] Fix spotless divergence for FilterContoursPipe (#908) Co-authored-by: Matt --- .../vision/pipe/impl/FilterContoursPipe.java | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FilterContoursPipe.java b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FilterContoursPipe.java index 336dfef7a6..1e7616c44f 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FilterContoursPipe.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipe/impl/FilterContoursPipe.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; - import org.opencv.core.RotatedRect; import org.photonvision.common.util.numbers.DoubleCouple; import org.photonvision.vision.frame.FrameStaticProperties; @@ -47,15 +46,6 @@ protected List process(List in) { private void rejectOutliers(List list, double xTol, double yTol) { if (list.size() < 2) return; // Must have at least 2 points to reject outliers -/* - // Sort by X and find median - list.sort(Comparator.comparingDouble(c -> c.getCenterPoint().x)); - - double medianX = list.get(list.size() / 2).getCenterPoint().x; - if (list.size() % 2 == 0) - medianX = (medianX + list.get(list.size() / 2 - 1).getCenterPoint().x) / 2; -*/ - double meanX = list.stream().mapToDouble(it -> it.getCenterPoint().x).sum() / list.size(); double stdDevX = @@ -63,15 +53,6 @@ private void rejectOutliers(List list, double xTol, double yTol) { stdDevX /= (list.size() - 1); stdDevX = Math.sqrt(stdDevX); -/* - // Sort by Y and find median - list.sort(Comparator.comparingDouble(c -> c.getCenterPoint().y)); - - double medianY = list.get(list.size() / 2).getCenterPoint().y; - if (list.size() % 2 == 0) - medianY = (medianY + list.get(list.size() / 2 - 1).getCenterPoint().y) / 2; -*/ - double meanY = list.stream().mapToDouble(it -> it.getCenterPoint().y).sum() / list.size(); double stdDevY = @@ -112,7 +93,8 @@ private void filterContour(Contour contour) { if (contourArea <= minFullness || contourArea >= maxFullness) return; // Aspect Ratio Filtering. - double aspectRatio = TargetCalculations.getAspectRatio(contour.getMinAreaRect(), params.isLandscape); + double aspectRatio = + TargetCalculations.getAspectRatio(contour.getMinAreaRect(), params.isLandscape); if (aspectRatio < params.getRatio().getFirst() || aspectRatio > params.getRatio().getSecond()) return; @@ -134,7 +116,8 @@ public FilterContoursParams( DoubleCouple extent, FrameStaticProperties camProperties, double xTol, - double yTol, boolean isLandscape) { + double yTol, + boolean isLandscape) { this.m_area = area; this.m_ratio = ratio; this.m_fullness = extent;