X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FQuickSort.java;h=8f7e11675774cf4f028223f92f31621aac0bb4bc;hb=057425f8881d0e8986e9e7a8004b709e42334f34;hp=017921ff3e832de1d0a49c1bbcb4dde3f037b19a;hpb=10a9a04653384ec6cd075ab8add2f0c661d8bb1c;p=jalview.git diff --git a/src/jalview/util/QuickSort.java b/src/jalview/util/QuickSort.java index 017921f..8f7e116 100755 --- a/src/jalview/util/QuickSort.java +++ b/src/jalview/util/QuickSort.java @@ -1,17 +1,17 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) + * Copyright (C) 2008 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 * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * 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. - * + * * 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 @@ -24,7 +24,7 @@ public class QuickSort { sort(arr, 0, arr.length - 1, s); } - + public static void sort(double[] arr, Object[] s) { sort(arr, 0, arr.length - 1, s); @@ -58,6 +58,7 @@ public class QuickSort sort(arr, q + 1, r, s); } } + public static void sort(double[] arr, int p, int r, Object[] s) { int q; @@ -81,14 +82,12 @@ public class QuickSort do { j = j - 1; - } - while (arr[j] > x); + } while (arr[j] > x); do { i = i + 1; - } - while (arr[i] < x); + } while (arr[i] < x); if (i < j) { @@ -118,14 +117,12 @@ public class QuickSort do { j = j - 1; - } - while (arr[j] > x); + } while (arr[j] > x); do { i = i + 1; - } - while (arr[i] < x); + } while (arr[i] < x); if (i < j) { @@ -155,14 +152,12 @@ public class QuickSort do { j = j - 1; - } - while (arr[j].compareTo(x) < 0); + } while (arr[j].compareTo(x) < 0); do { i = i + 1; - } - while (arr[i].compareTo(x) > 0); + } while (arr[i].compareTo(x) > 0); if (i < j) {