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