X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FQuickSort.java;h=0c0fabfb9c11f8b3e80e7306f3e7a0669f62a312;hb=5969ead0fd401f4435a3435ede9e4e87cf9c1d0b;hp=c1ef153c48f4af2d7b567b7b105955bbaa784b4b;hpb=d616b0e1ac213a82591cece50ea25c5bfbfa865f;p=jalview.git diff --git a/src/jalview/util/QuickSort.java b/src/jalview/util/QuickSort.java index c1ef153..0c0fabf 100755 --- a/src/jalview/util/QuickSort.java +++ b/src/jalview/util/QuickSort.java @@ -51,8 +51,8 @@ public class QuickSort @Override public int compare(Integer o1, Integer o2) { - return ascending ? Float.compare(values[o1], values[o2]) : Float - .compare(values[o2], values[o1]); + return ascending ? Float.compare(values[o1], values[o2]) + : Float.compare(values[o2], values[o1]); } } @@ -105,8 +105,8 @@ public class QuickSort @Override public int compare(Integer o1, Integer o2) { - return ascending ? Integer.compare(values[o1], values[o2]) : Integer - .compare(values[o2], values[o1]); + return ascending ? Integer.compare(values[o1], values[o2]) + : Integer.compare(values[o2], values[o1]); } } @@ -129,8 +129,8 @@ public class QuickSort @Override public int compare(Integer o1, Integer o2) { - return ascending ? values[o1].compareTo(values[o2]) : values[o2] - .compareTo(values[o1]); + return ascending ? values[o1].compareTo(values[o2]) + : values[o2].compareTo(values[o1]); } } @@ -475,10 +475,10 @@ public class QuickSort /* * Copy sorted positive values after the negatives and zeros */ - System.arraycopy(nonZeroFloats, negativeCount, arr, negativeCount - + zerosCount, positiveCount); - System.arraycopy(nonZeroChars, negativeCount, s, negativeCount - + zerosCount, positiveCount); + System.arraycopy(nonZeroFloats, negativeCount, arr, + negativeCount + zerosCount, positiveCount); + System.arraycopy(nonZeroChars, negativeCount, s, + negativeCount + zerosCount, positiveCount); } /** @@ -613,10 +613,10 @@ public class QuickSort /* * Copy sorted positive values after the negatives and zeros */ - System.arraycopy(nonZeroInts, negativeCount, arr, negativeCount - + zerosCount, positiveCount); - System.arraycopy(nonZeroChars, negativeCount, s, negativeCount - + zerosCount, positiveCount); + System.arraycopy(nonZeroInts, negativeCount, arr, + negativeCount + zerosCount, positiveCount); + System.arraycopy(nonZeroChars, negativeCount, s, + negativeCount + zerosCount, positiveCount); } /** @@ -670,7 +670,7 @@ public class QuickSort final int length = arr.length; Integer[] indices = makeIndexArray(length); Arrays.sort(indices, new IntComparator(arr, ascending)); - + /* * Copy the array values as per the sorted indices */ @@ -681,7 +681,7 @@ public class QuickSort sortedInts[i] = arr[indices[i]]; sortedObjects[i] = s[indices[i]]; } - + /* * And copy the sorted values back into the arrays */ @@ -707,7 +707,7 @@ public class QuickSort final int length = arr.length; Integer[] indices = makeIndexArray(length); Arrays.sort(indices, new ExternalComparator(arr, ascending)); - + /* * Copy the array values as per the sorted indices */ @@ -718,7 +718,7 @@ public class QuickSort sortedStrings[i] = arr[indices[i]]; sortedObjects[i] = s[indices[i]]; } - + /* * And copy the sorted values back into the arrays */ @@ -743,7 +743,7 @@ public class QuickSort final int length = arr.length; Integer[] indices = makeIndexArray(length); Arrays.sort(indices, new DoubleComparator(arr, ascending)); - + /* * Copy the array values as per the sorted indices */ @@ -754,7 +754,7 @@ public class QuickSort sortedDoubles[i] = arr[indices[i]]; sortedObjects[i] = s[indices[i]]; } - + /* * And copy the sorted values back into the arrays */