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
Jalview 2.6 source licence
[jalview.git]
/
src
/
jalview
/
util
/
QuickSort.java
diff --git
a/src/jalview/util/QuickSort.java
b/src/jalview/util/QuickSort.java
index
a482fef
..
1e3e5c1
100755
(executable)
--- a/
src/jalview/util/QuickSort.java
+++ b/
src/jalview/util/QuickSort.java
@@
-1,25
+1,29
@@
/*
/*
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.
*/
package jalview.util;
public class QuickSort
{
*/
package jalview.util;
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);
@@
-71,6
+75,18
@@
public class QuickSort
}
}
}
}
+ 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)
{
float x = arr[p];
private static int partition(float[] arr, int p, int r, Object[] s)
{
float x = arr[p];
@@
-106,6
+122,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)
{
double x = arr[p];
private static int partition(double[] arr, int p, int r, Object[] s)
{
double x = arr[p];