X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FQuickSort.java;h=0c0fabfb9c11f8b3e80e7306f3e7a0669f62a312;hb=3699e0fd64de573799a6cd2fd78da5dfc670d98e;hp=521783e4ca480b99c3e8b57886fb937bcd6e5a81;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/util/QuickSort.java b/src/jalview/util/QuickSort.java index 521783e..0c0fabf 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,8 @@ 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], values[o2]) + : Float.compare(values[o2], values[o1]); } } @@ -105,8 +105,8 @@ 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], values[o2]) + : Integer.compare(values[o2], values[o1]); } } @@ -129,8 +129,8 @@ 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].compareTo(values[o2]) + : values[o2].compareTo(values[o1]); } } @@ -475,10 +475,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 +613,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); } /**