X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FQuickSort.java;h=6901e244ca5af1f14edaddbf6cb09e39915b1eb2;hb=1db943794a28bdd593776ef14fe5ef9f3cd50ba8;hp=521783e4ca480b99c3e8b57886fb937bcd6e5a81;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/util/QuickSort.java b/src/jalview/util/QuickSort.java index 521783e..6901e24 100755 --- 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.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -51,8 +51,9 @@ 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.intValue()], values[o2.intValue()]) + : Float.compare(values[o2.intValue()], values[o1.intValue()]); } } @@ -77,11 +78,11 @@ public class QuickSort { if (ascending) { - return Double.compare(values[o1], values[o2]); + return Double.compare(values[o1.intValue()], values[o2.intValue()]); } else { - return Double.compare(values[o2], values[o1]); + return Double.compare(values[o2.intValue()], values[o1.intValue()]); } } } @@ -105,8 +106,11 @@ 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.intValue()], + values[o2.intValue()]) + : Integer.compare(values[o2.intValue()], + values[o1.intValue()]); } } @@ -129,8 +133,9 @@ 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.intValue()].compareTo(values[o2.intValue()]) + : values[o2.intValue()].compareTo(values[o1.intValue()]); } } @@ -475,10 +480,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 +618,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); } /**