git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-845 minor tidy / tests / javadoc tweaks
[jalview.git]
/
src
/
jalview
/
util
/
QuickSort.java
diff --git
a/src/jalview/util/QuickSort.java
b/src/jalview/util/QuickSort.java
index
e3bb514
..
cedf656
100755
(executable)
--- a/
src/jalview/util/QuickSort.java
+++ b/
src/jalview/util/QuickSort.java
@@
-20,29
+20,64
@@
*/
package jalview.util;
*/
package jalview.util;
+/**
+ * A class to perform efficient sorting of arrays of objects based on arrays of
+ * scores or other attributes. For example, residues by frequency.
+ *
+ * @author gmcarstairs
+ *
+ */
public class QuickSort
{
public class QuickSort
{
+ /**
+ * Sorts both arrays with respect to ascending order of the items in the first
+ * array.
+ *
+ * @param arr
+ * @param s
+ */
public static void sort(int[] arr, Object[] s)
{
sort(arr, 0, arr.length - 1, s);
}
public static void sort(int[] arr, Object[] s)
{
sort(arr, 0, arr.length - 1, s);
}
+ /**
+ * Sorts both arrays with respect to ascending order of the items in the first
+ * array.
+ *
+ * @param arr
+ * @param s
+ */
public static void sort(float[] arr, Object[] s)
{
sort(arr, 0, arr.length - 1, s);
}
public static void sort(float[] arr, Object[] s)
{
sort(arr, 0, arr.length - 1, s);
}
+ /**
+ * Sorts both arrays with respect to ascending order of the items in the first
+ * array.
+ *
+ * @param arr
+ * @param s
+ */
public static void sort(double[] arr, Object[] s)
{
sort(arr, 0, arr.length - 1, s);
}
public static void sort(double[] arr, Object[] s)
{
sort(arr, 0, arr.length - 1, s);
}
+ /**
+ * Sorts both arrays with respect to descending order of the items in the
+ * first array.
+ *
+ * @param arr
+ * @param s
+ */
public static void sort(String[] arr, Object[] s)
{
stringSort(arr, 0, arr.length - 1, s);
}
public static void sort(String[] arr, Object[] s)
{
stringSort(arr, 0, arr.length - 1, s);
}
- public static void stringSort(String[] arr, int p, int r, Object[] s)
+ static void stringSort(String[] arr, int p, int r, Object[] s)
{
int q;
{
int q;
@@
-54,7
+89,7
@@
public class QuickSort
}
}
}
}
- public static void sort(float[] arr, int p, int r, Object[] s)
+ static void sort(float[] arr, int p, int r, Object[] s)
{
int q;
{
int q;
@@
-66,7
+101,7
@@
public class QuickSort
}
}
}
}
- public static void sort(double[] arr, int p, int r, Object[] s)
+ static void sort(double[] arr, int p, int r, Object[] s)
{
int q;
{
int q;
@@
-78,7
+113,7
@@
public class QuickSort
}
}
}
}
- public static void sort(int[] arr, int p, int r, Object[] s)
+ static void sort(int[] arr, int p, int r, Object[] s)
{
int q;
{
int q;
@@
-90,7
+125,7
@@
public class QuickSort
}
}
}
}
- private static int partition(float[] arr, int p, int r, Object[] s)
+ static int partition(float[] arr, int p, int r, Object[] s)
{
float x = arr[p];
int i = p - 1;
{
float x = arr[p];
int i = p - 1;
@@
-125,7
+160,7
@@
public class QuickSort
}
}
}
}
- private static int partition(int[] arr, int p, int r, Object[] s)
+ static int partition(int[] arr, int p, int r, Object[] s)
{
int x = arr[p];
int i = p - 1;
{
int x = arr[p];
int i = p - 1;
@@
-160,7
+195,7
@@
public class QuickSort
}
}
}
}
- private static int partition(double[] arr, int p, int r, Object[] s)
+ static int partition(double[] arr, int p, int r, Object[] s)
{
double x = arr[p];
int i = p - 1;
{
double x = arr[p];
int i = p - 1;
@@
-195,7
+230,7
@@
public class QuickSort
}
}
}
}
- private static int stringPartition(String[] arr, int p, int r, Object[] s)
+ static int stringPartition(String[] arr, int p, int r, Object[] s)
{
String x = arr[p];
int i = p - 1;
{
String x = arr[p];
int i = p - 1;