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
prevent duplicate service submission links
[jalview.git]
/
src
/
jalview
/
util
/
QuickSort.java
diff --git
a/src/jalview/util/QuickSort.java
b/src/jalview/util/QuickSort.java
index
8f7e116
..
c28928d
100755
(executable)
--- a/
src/jalview/util/QuickSort.java
+++ b/
src/jalview/util/QuickSort.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
+ * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-20,6
+20,10
@@
package jalview.util;
public class QuickSort
{
public class QuickSort
{
+ public static void sort(int[] 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);
public static void sort(float[] arr, Object[] s)
{
sort(arr, 0, arr.length - 1, s);
@@
-70,6
+74,17
@@
public class QuickSort
sort(arr, q + 1, r, s);
}
}
sort(arr, q + 1, r, s);
}
}
+ public static void sort(int[] arr, int p, int r, Object[] s)
+ {
+ int q;
+
+ if (p < r)
+ {
+ q = partition(arr, p, r, s);
+ sort(arr, p, q, s);
+ sort(arr, q + 1, r, s);
+ }
+ }
private static int partition(float[] arr, int p, int r, Object[] s)
{
private static int partition(float[] arr, int p, int r, Object[] s)
{
@@
-105,6
+120,41
@@
public class QuickSort
}
}
}
}
}
}
+
+ private static int partition(int[] arr, int p, int r, Object[] s)
+ {
+ int x = arr[p];
+ int i = p - 1;
+ int j = r + 1;
+
+ while (true)
+ {
+ do
+ {
+ j = j - 1;
+ } while (arr[j] > x);
+
+ do
+ {
+ i = i + 1;
+ } while (arr[i] < x);
+
+ if (i < j)
+ {
+ int tmp = arr[i];
+ arr[i] = arr[j];
+ arr[j] = tmp;
+
+ Object tmp2 = s[i];
+ s[i] = s[j];
+ s[j] = tmp2;
+ }
+ else
+ {
+ return j;
+ }
+ }
+ }
private static int partition(double[] arr, int p, int r, Object[] s)
{
private static int partition(double[] arr, int p, int r, Object[] s)
{