X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fqrcode%2Fdetector%2FFinderPatternFinder.java;h=9968f009886915858daf068f9c43afdd46439fbf;hb=HEAD;hp=4ef3d58cdc364771ab3daab06c20f0e3c34917dc;hpb=637425045ec4c4ff505688200fce830c07db46e8;p=zxing.git diff --git a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java index 4ef3d58c..9968f009 100755 --- a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java +++ b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 Google Inc. + * Copyright 2007 ZXing authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,55 +16,82 @@ package com.google.zxing.qrcode.detector; -import com.google.zxing.MonochromeBitmapSource; -import com.google.zxing.ReaderException; +import com.google.zxing.DecodeHintType; +import com.google.zxing.NotFoundException; import com.google.zxing.ResultPoint; -import com.google.zxing.common.BitArray; +import com.google.zxing.ResultPointCallback; +import com.google.zxing.common.BitMatrix; import com.google.zxing.common.Collections; import com.google.zxing.common.Comparator; +import java.util.Hashtable; import java.util.Vector; /** *

This class attempts to find finder patterns in a QR Code. Finder patterns are the square * markers at three corners of a QR Code.

* - *

This class is not thread-safe and should not be reused.

+ *

This class is thread-safe but not reentrant. Each thread must allocate its own object. * - * @author srowen@google.com (Sean Owen) + * @author Sean Owen */ -final class FinderPatternFinder { +public class FinderPatternFinder { private static final int CENTER_QUORUM = 2; - private static final int BIG_SKIP = 3; + protected static final int MIN_SKIP = 3; // 1 pixel/module times 3 modules/center + protected static final int MAX_MODULES = 57; // support up to version 10 for mobile clients + private static final int INTEGER_MATH_SHIFT = 8; - private final MonochromeBitmapSource image; + private final BitMatrix image; private final Vector possibleCenters; private boolean hasSkipped; + private final int[] crossCheckStateCount; + private final ResultPointCallback resultPointCallback; /** *

Creates a finder that will search the image for three finder patterns.

* * @param image image to search */ - FinderPatternFinder(MonochromeBitmapSource image) { + public FinderPatternFinder(BitMatrix image) { + this(image, null); + } + + public FinderPatternFinder(BitMatrix image, ResultPointCallback resultPointCallback) { this.image = image; - this.possibleCenters = new Vector(5); + this.possibleCenters = new Vector(); + this.crossCheckStateCount = new int[5]; + this.resultPointCallback = resultPointCallback; + } + + protected BitMatrix getImage() { + return image; } - FinderPatternInfo find() throws ReaderException { + protected Vector getPossibleCenters() { + return possibleCenters; + } + + FinderPatternInfo find(Hashtable hints) throws NotFoundException { + boolean tryHarder = hints != null && hints.containsKey(DecodeHintType.TRY_HARDER); int maxI = image.getHeight(); int maxJ = image.getWidth(); // We are looking for black/white/black/white/black modules in // 1:1:3:1:1 ratio; this tracks the number of such modules seen so far - int[] stateCount = new int[5]; + + // Let's assume that the maximum version QR Code we support takes up 1/4 the height of the + // image, and then account for the center being 3 modules in size. This gives the smallest + // number of pixels the center could be, so skip this often. When trying harder, look for all + // QR versions regardless of how dense they are. + int iSkip = (3 * maxI) / (4 * MAX_MODULES); + if (iSkip < MIN_SKIP || tryHarder) { + iSkip = MIN_SKIP; + } + boolean done = false; - // We can afford to examine every few lines until we've started finding - // the patterns - int iSkip = BIG_SKIP; + int[] stateCount = new int[5]; for (int i = iSkip - 1; i < maxI && !done; i += iSkip) { // Get a row of black/white values - BitArray blackRow = image.getBlackRow(i, null, 0, maxJ); stateCount[0] = 0; stateCount[1] = 0; stateCount[2] = 0; @@ -72,7 +99,7 @@ final class FinderPatternFinder { stateCount[4] = 0; int currentState = 0; for (int j = 0; j < maxJ; j++) { - if (blackRow.get(j)) { + if (image.get(j, i)) { // Black pixel if ((currentState & 1) == 1) { // Counting white pixels currentState++; @@ -84,9 +111,11 @@ final class FinderPatternFinder { if (foundPatternCross(stateCount)) { // Yes boolean confirmed = handlePossibleCenter(stateCount, i, j); if (confirmed) { - iSkip = 1; // Go back to examining each line + // Start examining every other line. Checking each line turned out to be too + // expensive and didn't improve performance. + iSkip = 2; if (hasSkipped) { - done = haveMulitplyConfirmedCenters(); + done = haveMultiplyConfirmedCenters(); } else { int rowSkip = findRowSkip(); if (rowSkip > stateCount[2]) { @@ -103,11 +132,13 @@ final class FinderPatternFinder { } } } else { - // Advance to next black pixel - do { - j++; - } while (j < maxJ && !blackRow.get(j)); - j--; // back up to that last white pixel + stateCount[0] = stateCount[2]; + stateCount[1] = stateCount[3]; + stateCount[2] = stateCount[4]; + stateCount[3] = 1; + stateCount[4] = 0; + currentState = 3; + continue; } // Clear state to start looking again currentState = 0; @@ -138,20 +169,16 @@ final class FinderPatternFinder { iSkip = stateCount[0]; if (hasSkipped) { // Found a third one - done = haveMulitplyConfirmedCenters(); + done = haveMultiplyConfirmedCenters(); } } } } FinderPattern[] patternInfo = selectBestPatterns(); - patternInfo = orderBestPatterns(patternInfo); - float totalModuleSize = 0.0f; - for (int i = 0; i < patternInfo.length; i++) { - totalModuleSize += patternInfo[i].getEstimatedModuleSize(); - } + ResultPoint.orderBestPatterns(patternInfo); - return new FinderPatternInfo(totalModuleSize / (float) patternInfo.length, patternInfo); + return new FinderPatternInfo(patternInfo); } /** @@ -164,27 +191,38 @@ final class FinderPatternFinder { /** * @param stateCount count of black/white/black/white/black pixels just read - * @return true iff the proportions of the counts is close enough to the 1/13/1/1 ratios - * used by finder patterns to be considered a match + * @return true iff the proportions of the counts is close enough to the 1/1/3/1/1 ratios + * used by finder patterns to be considered a match */ - private static boolean foundPatternCross(int[] stateCount) { + protected static boolean foundPatternCross(int[] stateCount) { int totalModuleSize = 0; for (int i = 0; i < 5; i++) { - if (stateCount[i] == 0) { + int count = stateCount[i]; + if (count == 0) { return false; } - totalModuleSize += stateCount[i]; + totalModuleSize += count; } if (totalModuleSize < 7) { return false; } - int moduleSize = totalModuleSize / 7; - // Allow less than 50% deviance from 1-1-3-1-1 pattern - return Math.abs(moduleSize - stateCount[0]) << 1 <= moduleSize && - Math.abs(moduleSize - stateCount[1]) << 1 <= moduleSize && - Math.abs(3 * moduleSize - stateCount[2]) << 1 <= 3 * moduleSize && - Math.abs(moduleSize - stateCount[3]) << 1 <= moduleSize && - Math.abs(moduleSize - stateCount[4]) << 1 <= moduleSize; + int moduleSize = (totalModuleSize << INTEGER_MATH_SHIFT) / 7; + int maxVariance = moduleSize / 2; + // Allow less than 50% variance from 1-1-3-1-1 proportions + return Math.abs(moduleSize - (stateCount[0] << INTEGER_MATH_SHIFT)) < maxVariance && + Math.abs(moduleSize - (stateCount[1] << INTEGER_MATH_SHIFT)) < maxVariance && + Math.abs(3 * moduleSize - (stateCount[2] << INTEGER_MATH_SHIFT)) < 3 * maxVariance && + Math.abs(moduleSize - (stateCount[3] << INTEGER_MATH_SHIFT)) < maxVariance && + Math.abs(moduleSize - (stateCount[4] << INTEGER_MATH_SHIFT)) < maxVariance; + } + + private int[] getCrossCheckStateCount() { + crossCheckStateCount[0] = 0; + crossCheckStateCount[1] = 0; + crossCheckStateCount[2] = 0; + crossCheckStateCount[3] = 0; + crossCheckStateCount[4] = 0; + return crossCheckStateCount; } /** @@ -195,25 +233,26 @@ final class FinderPatternFinder { * @param startI row where a finder pattern was detected * @param centerJ center of the section that appears to cross a finder pattern * @param maxCount maximum reasonable number of modules that should be - * observed in any reading state, based on the results of the horizontal scan + * observed in any reading state, based on the results of the horizontal scan * @return vertical center of finder pattern, or {@link Float#NaN} if not found */ - private float crossCheckVertical(int startI, int centerJ, int maxCount) { - MonochromeBitmapSource image = this.image; + private float crossCheckVertical(int startI, int centerJ, int maxCount, + int originalStateCountTotal) { + BitMatrix image = this.image; int maxI = image.getHeight(); - int[] stateCount = new int[5]; + int[] stateCount = getCrossCheckStateCount(); // Start counting up from center int i = startI; - while (i >= 0 && image.isBlack(centerJ, i)) { + while (i >= 0 && image.get(centerJ, i)) { stateCount[2]++; i--; } if (i < 0) { return Float.NaN; } - while (i >= 0 && !image.isBlack(centerJ, i) && stateCount[1] <= maxCount) { + while (i >= 0 && !image.get(centerJ, i) && stateCount[1] <= maxCount) { stateCount[1]++; i--; } @@ -221,31 +260,31 @@ final class FinderPatternFinder { if (i < 0 || stateCount[1] > maxCount) { return Float.NaN; } - while (i >= 0 && image.isBlack(centerJ, i) && stateCount[0] <= maxCount) { + while (i >= 0 && image.get(centerJ, i) && stateCount[0] <= maxCount) { stateCount[0]++; i--; } - if (i < 0 || stateCount[0] > maxCount) { + if (stateCount[0] > maxCount) { return Float.NaN; } // Now also count down from center i = startI + 1; - while (i < maxI && image.isBlack(centerJ, i)) { + while (i < maxI && image.get(centerJ, i)) { stateCount[2]++; i++; } if (i == maxI) { return Float.NaN; } - while (i < maxI && !image.isBlack(centerJ, i) && stateCount[3] < maxCount) { + while (i < maxI && !image.get(centerJ, i) && stateCount[3] < maxCount) { stateCount[3]++; i++; } if (i == maxI || stateCount[3] >= maxCount) { return Float.NaN; } - while (i < maxI && image.isBlack(centerJ, i) && stateCount[4] < maxCount) { + while (i < maxI && image.get(centerJ, i) && stateCount[4] < maxCount) { stateCount[4]++; i++; } @@ -253,59 +292,68 @@ final class FinderPatternFinder { return Float.NaN; } + // If we found a finder-pattern-like section, but its size is more than 40% different than + // the original, assume it's a false positive + int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + + stateCount[4]; + if (5 * Math.abs(stateCountTotal - originalStateCountTotal) >= 2 * originalStateCountTotal) { + return Float.NaN; + } + return foundPatternCross(stateCount) ? centerFromEnd(stateCount, i) : Float.NaN; } /** - *

Like {@link #crossCheckVertical(int, int, int)}, and in fact is basically identical, + *

Like {@link #crossCheckVertical(int, int, int, int)}, and in fact is basically identical, * except it reads horizontally instead of vertically. This is used to cross-cross * check a vertical cross check and locate the real center of the alignment pattern.

*/ - private float crossCheckHorizontal(int startJ, int centerI, int maxCount) { - MonochromeBitmapSource image = this.image; + private float crossCheckHorizontal(int startJ, int centerI, int maxCount, + int originalStateCountTotal) { + BitMatrix image = this.image; int maxJ = image.getWidth(); - int[] stateCount = new int[5]; + int[] stateCount = getCrossCheckStateCount(); int j = startJ; - while (j >= 0 && image.isBlack(j, centerI)) { + while (j >= 0 && image.get(j, centerI)) { stateCount[2]++; j--; } if (j < 0) { return Float.NaN; } - while (j >= 0 && !image.isBlack(j, centerI) && stateCount[1] <= maxCount) { + while (j >= 0 && !image.get(j, centerI) && stateCount[1] <= maxCount) { stateCount[1]++; j--; } if (j < 0 || stateCount[1] > maxCount) { return Float.NaN; } - while (j >= 0 && image.isBlack(j, centerI) && stateCount[0] <= maxCount) { + while (j >= 0 && image.get(j, centerI) && stateCount[0] <= maxCount) { stateCount[0]++; j--; } - if (j < 0 || stateCount[0] > maxCount) { + if (stateCount[0] > maxCount) { return Float.NaN; } j = startJ + 1; - while (j < maxJ && image.isBlack(j, centerI)) { + while (j < maxJ && image.get(j, centerI)) { stateCount[2]++; j++; } if (j == maxJ) { return Float.NaN; } - while (j < maxJ && !image.isBlack(j, centerI) && stateCount[3] < maxCount) { + while (j < maxJ && !image.get(j, centerI) && stateCount[3] < maxCount) { stateCount[3]++; j++; } if (j == maxJ || stateCount[3] >= maxCount) { return Float.NaN; } - while (j < maxJ && image.isBlack(j, centerI) && stateCount[4] < maxCount) { + while (j < maxJ && image.get(j, centerI) && stateCount[4] < maxCount) { stateCount[4]++; j++; } @@ -313,6 +361,14 @@ final class FinderPatternFinder { return Float.NaN; } + // If we found a finder-pattern-like section, but its size is significantly different than + // the original, assume it's a false positive + int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + + stateCount[4]; + if (5 * Math.abs(stateCountTotal - originalStateCountTotal) >= originalStateCountTotal) { + return Float.NaN; + } + return foundPatternCross(stateCount) ? centerFromEnd(stateCount, j) : Float.NaN; } @@ -332,17 +388,16 @@ final class FinderPatternFinder { * @param j end of possible finder pattern in row * @return true if a finder pattern candidate was found this time */ - private boolean handlePossibleCenter(int[] stateCount, - int i, - int j) { + protected boolean handlePossibleCenter(int[] stateCount, int i, int j) { + int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + + stateCount[4]; float centerJ = centerFromEnd(stateCount, j); - float centerI = crossCheckVertical(i, (int) centerJ, stateCount[2]); + float centerI = crossCheckVertical(i, (int) centerJ, stateCount[2], stateCountTotal); if (!Float.isNaN(centerI)) { // Re-cross check - centerJ = crossCheckHorizontal((int) centerJ, (int) centerI, stateCount[2]); + centerJ = crossCheckHorizontal((int) centerJ, (int) centerI, stateCount[2], stateCountTotal); if (!Float.isNaN(centerJ)) { - float estimatedModuleSize = - (float) (stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + stateCount[4]) / 7.0f; + float estimatedModuleSize = (float) stateCountTotal / 7.0f; boolean found = false; int max = possibleCenters.size(); for (int index = 0; index < max; index++) { @@ -355,7 +410,11 @@ final class FinderPatternFinder { } } if (!found) { - possibleCenters.addElement(new FinderPattern(centerJ, centerI, estimatedModuleSize)); + ResultPoint point = new FinderPattern(centerJ, centerI, estimatedModuleSize); + possibleCenters.addElement(point); + if (resultPointCallback != null) { + resultPointCallback.foundPossibleResultPoint(point); + } } return true; } @@ -365,9 +424,9 @@ final class FinderPatternFinder { /** * @return number of rows we could safely skip during scanning, based on the first - * two finder patterns that have been located. In some cases their position will - * allow us to infer that the third pattern must lie below a certain point farther - * down in the image. + * two finder patterns that have been located. In some cases their position will + * allow us to infer that the third pattern must lie below a certain point farther + * down in the image. */ private int findRowSkip() { int max = possibleCenters.size(); @@ -385,10 +444,10 @@ final class FinderPatternFinder { // How far down can we skip before resuming looking for the next // pattern? In the worst case, only the difference between the // difference in the x / y coordinates of the two centers. - // This is the case where you find top left first. Draw it out. + // This is the case where you find top left last. hasSkipped = true; - return (int) Math.abs(Math.abs(firstConfirmedCenter.getX() - center.getX()) - - Math.abs(firstConfirmedCenter.getY() - center.getY())); + return (int) (Math.abs(firstConfirmedCenter.getX() - center.getX()) - + Math.abs(firstConfirmedCenter.getY() - center.getY())) / 2; } } } @@ -397,156 +456,129 @@ final class FinderPatternFinder { /** * @return true iff we have found at least 3 finder patterns that have been detected - * at least {@link #CENTER_QUORUM} times each + * at least {@link #CENTER_QUORUM} times each, and, the estimated module size of the + * candidates is "pretty similar" */ - private boolean haveMulitplyConfirmedCenters() { - int count = 0; + private boolean haveMultiplyConfirmedCenters() { + int confirmedCount = 0; + float totalModuleSize = 0.0f; int max = possibleCenters.size(); for (int i = 0; i < max; i++) { - if (((FinderPattern) possibleCenters.elementAt(i)).getCount() >= CENTER_QUORUM) { - if (++count == 3) { - return true; - } + FinderPattern pattern = (FinderPattern) possibleCenters.elementAt(i); + if (pattern.getCount() >= CENTER_QUORUM) { + confirmedCount++; + totalModuleSize += pattern.getEstimatedModuleSize(); } } - return false; + if (confirmedCount < 3) { + return false; + } + // OK, we have at least 3 confirmed centers, but, it's possible that one is a "false positive" + // and that we need to keep looking. We detect this by asking if the estimated module sizes + // vary too much. We arbitrarily say that when the total deviation from average exceeds + // 5% of the total module size estimates, it's too much. + float average = totalModuleSize / (float) max; + float totalDeviation = 0.0f; + for (int i = 0; i < max; i++) { + FinderPattern pattern = (FinderPattern) possibleCenters.elementAt(i); + totalDeviation += Math.abs(pattern.getEstimatedModuleSize() - average); + } + return totalDeviation <= 0.05f * totalModuleSize; } /** * @return the 3 best {@link FinderPattern}s from our list of candidates. The "best" are - * those that have been detected at least {@link #CENTER_QUORUM} times, and whose module - * size differs from the average among those patterns the least - * @throws ReaderException if 3 such finder patterns do not exist + * those that have been detected at least {@link #CENTER_QUORUM} times, and whose module + * size differs from the average among those patterns the least + * @throws NotFoundException if 3 such finder patterns do not exist */ - private FinderPattern[] selectBestPatterns() throws ReaderException { - Collections.insertionSort(possibleCenters, new CenterComparator()); - int size = 0; - int max = possibleCenters.size(); - while (size < max) { - if (((FinderPattern) possibleCenters.elementAt(size)).getCount() < CENTER_QUORUM) { - break; - } - size++; - } + private FinderPattern[] selectBestPatterns() throws NotFoundException { - if (size < 3) { + int startSize = possibleCenters.size(); + if (startSize < 3) { // Couldn't find enough finder patterns - throw new ReaderException("Could not find three finder patterns"); - } + throw NotFoundException.getNotFoundInstance(); + } + + // Filter outlier possibilities whose module size is too different + if (startSize > 3) { + // But we can only afford to do so if we have at least 4 possibilities to choose from + float totalModuleSize = 0.0f; + float square = 0.0f; + for (int i = 0; i < startSize; i++) { + float size = ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize(); + totalModuleSize += size; + square += size * size; + } + float average = totalModuleSize / (float) startSize; + float stdDev = (float) Math.sqrt(square / startSize - average * average); - if (size == 3) { - // Found just enough -- hope these are good! - // toArray() is not available - FinderPattern[] result = new FinderPattern[possibleCenters.size()]; - for (int i = 0; i < possibleCenters.size(); i++) { - result[i] = (FinderPattern) possibleCenters.elementAt(i); + Collections.insertionSort(possibleCenters, new FurthestFromAverageComparator(average)); + + float limit = Math.max(0.2f * average, stdDev); + + for (int i = 0; i < possibleCenters.size() && possibleCenters.size() > 3; i++) { + FinderPattern pattern = (FinderPattern) possibleCenters.elementAt(i); + if (Math.abs(pattern.getEstimatedModuleSize() - average) > limit) { + possibleCenters.removeElementAt(i); + i--; + } } - return result; } - possibleCenters.setSize(size); + if (possibleCenters.size() > 3) { + // Throw away all but those first size candidate points we found. - // Hmm, multiple found. We need to pick the best three. Find the most - // popular ones whose module size is nearest the average + float totalModuleSize = 0.0f; + for (int i = 0; i < possibleCenters.size(); i++) { + totalModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize(); + } - float averageModuleSize = 0.0f; - for (int i = 0; i < size; i++) { - averageModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize(); - } - averageModuleSize /= (float) size; + float average = totalModuleSize / (float) possibleCenters.size(); - // We don't have java.util.Collections in J2ME - Collections.insertionSort(possibleCenters, new ClosestToAverageComparator(averageModuleSize)); + Collections.insertionSort(possibleCenters, new CenterComparator(average)); - FinderPattern[] result = new FinderPattern[3]; - for (int i = 0; i < 3; i++) { - result[i] = (FinderPattern) possibleCenters.elementAt(i); + possibleCenters.setSize(3); } - return result; - } - /** - *

Having found three "best" finder patterns we need to decide which is the top-left, top-right, - * bottom-left. We assume that the one closest to the other two is the top-left one; this is not - * strictly true (imagine extreme perspective distortion) but for the moment is a serviceable assumption. - * Lastly we sort top-right from bottom-left by figuring out orientation from vector cross products.

- * - * @param patterns three best {@link FinderPattern}s - * @return same {@link FinderPattern}s ordered bottom-left, top-left, top-right - */ - private static FinderPattern[] orderBestPatterns(FinderPattern[] patterns) { - - // Find distances between pattern centers - float abDistance = distance(patterns[0], patterns[1]); - float bcDistance = distance(patterns[1], patterns[2]); - float acDistance = distance(patterns[0], patterns[2]); - - FinderPattern topLeft; - FinderPattern topRight; - FinderPattern bottomLeft; - // Assume one closest to other two is top left; - // topRight and bottomLeft will just be guesses below at first - if (bcDistance >= abDistance && bcDistance >= acDistance) { - topLeft = patterns[0]; - topRight = patterns[1]; - bottomLeft = patterns[2]; - } else if (acDistance >= bcDistance && acDistance >= abDistance) { - topLeft = patterns[1]; - topRight = patterns[0]; - bottomLeft = patterns[2]; - } else { - topLeft = patterns[2]; - topRight = patterns[0]; - bottomLeft = patterns[1]; - } - - // Use cross product to figure out which of other1/2 is the bottom left - // pattern. The vector "top-left -> bottom-left" x "top-left -> top-right" - // should yield a vector with positive z component - if ((bottomLeft.getY() - topLeft.getY()) * (topRight.getX() - topLeft.getX()) < - (bottomLeft.getX() - topLeft.getX()) * (topRight.getY() - topLeft.getY())) { - FinderPattern temp = topRight; - topRight = bottomLeft; - bottomLeft = temp; - } - - return new FinderPattern[]{bottomLeft, topLeft, topRight}; + return new FinderPattern[]{ + (FinderPattern) possibleCenters.elementAt(0), + (FinderPattern) possibleCenters.elementAt(1), + (FinderPattern) possibleCenters.elementAt(2) + }; } /** - * @return distance between two points - */ - static float distance(ResultPoint pattern1, ResultPoint pattern2) { - float xDiff = pattern1.getX() - pattern2.getX(); - float yDiff = pattern1.getY() - pattern2.getY(); - return (float) Math.sqrt((double) (xDiff * xDiff + yDiff * yDiff)); - } - - /** - *

Orders by {@link FinderPattern#getCount()}, descending.

+ *

Orders by furthest from average

*/ - private static class CenterComparator implements Comparator { + private static class FurthestFromAverageComparator implements Comparator { + private final float average; + private FurthestFromAverageComparator(float f) { + average = f; + } public int compare(Object center1, Object center2) { - return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount(); + float dA = Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - average); + float dB = Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - average); + return dA < dB ? -1 : (dA == dB ? 0 : 1); } } /** - *

Orders by variance from average module size, ascending.

+ *

Orders by {@link FinderPattern#getCount()}, descending.

*/ - private static class ClosestToAverageComparator implements Comparator { - private float averageModuleSize; - - private ClosestToAverageComparator(float averageModuleSize) { - this.averageModuleSize = averageModuleSize; + private static class CenterComparator implements Comparator { + private final float average; + private CenterComparator(float f) { + average = f; } - public int compare(Object center1, Object center2) { - return - Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - averageModuleSize) < - Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - averageModuleSize) ? - -1 : - 1; + if (((FinderPattern) center2).getCount() == ((FinderPattern) center1).getCount()) { + float dA = Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - average); + float dB = Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - average); + return dA < dB ? 1 : (dA == dB ? 0 : -1); + } else { + return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount(); + } } }