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
JAL-1807 disambiguated method signatures with numeric primitive args
[jalview.git]
/
src
/
jalview
/
util
/
QuickSort.java
diff --git
a/src/jalview/util/QuickSort.java
b/src/jalview/util/QuickSort.java
index
4826bc3
..
b0e75be
100755
(executable)
--- a/
src/jalview/util/QuickSort.java
+++ b/
src/jalview/util/QuickSort.java
@@
-75,9
+75,9
@@
public class QuickSort
* @param arr
* @param s
*/
* @param arr
* @param s
*/
- public static void sort(int[] arr, Object[] s)
+ public static void sortInt(int[] arr, Object[] s)
{
{
- sort(arr, 0, arr.length - 1, s);
+ sortInt(arr, 0, arr.length - 1, s);
}
/**
}
/**
@@
-87,9
+87,9
@@
public class QuickSort
* @param arr
* @param s
*/
* @param arr
* @param s
*/
- public static void sort(float[] arr, Object[] s)
+ public static void sortFloat(float[] arr, Object[] s)
{
{
- sort(arr, 0, arr.length - 1, s);
+ sortFloat(arr, 0, arr.length - 1, s);
}
/**
}
/**
@@
-99,9
+99,9
@@
public class QuickSort
* @param arr
* @param s
*/
* @param arr
* @param s
*/
- public static void sort(double[] arr, Object[] s)
+ public static void sortDouble(double[] arr, Object[] s)
{
{
- sort(arr, 0, arr.length - 1, s);
+ sortDouble(arr, 0, arr.length - 1, s);
}
/**
}
/**
@@
-128,43
+128,43
@@
public class QuickSort
}
}
}
}
- static void sort(float[] arr, int p, int r, Object[] s)
+ static void sortFloat(float[] arr, int p, int r, Object[] s)
{
int q;
if (p < r)
{
{
int q;
if (p < r)
{
- q = partition(arr, p, r, s);
- sort(arr, p, q, s);
- sort(arr, q + 1, r, s);
+ q = partitionFloat(arr, p, r, s);
+ sortFloat(arr, p, q, s);
+ sortFloat(arr, q + 1, r, s);
}
}
}
}
- static void sort(double[] arr, int p, int r, Object[] s)
+ static void sortDouble(double[] arr, int p, int r, Object[] s)
{
int q;
if (p < r)
{
{
int q;
if (p < r)
{
- q = partition(arr, p, r, s);
- sort(arr, p, q, s);
- sort(arr, q + 1, r, s);
+ q = partitionDouble(arr, p, r, s);
+ sortDouble(arr, p, q, s);
+ sortDouble(arr, q + 1, r, s);
}
}
}
}
- static void sort(int[] arr, int p, int r, Object[] s)
+ static void sortInt(int[] arr, int p, int r, Object[] s)
{
int q;
if (p < r)
{
{
int q;
if (p < r)
{
- q = partition(arr, p, r, s);
- sort(arr, p, q, s);
- sort(arr, q + 1, r, s);
+ q = partitionInt(arr, p, r, s);
+ sortInt(arr, p, q, s);
+ sortInt(arr, q + 1, r, s);
}
}
}
}
- static int partition(float[] arr, int p, int r, Object[] s)
+ static int partitionFloat(float[] arr, int p, int r, Object[] s)
{
float x = arr[p];
int i = p - 1;
{
float x = arr[p];
int i = p - 1;
@@
-199,7
+199,7
@@
public class QuickSort
}
}
}
}
- static int partition(float[] arr, int p, int r, char[] s)
+ static int partitionFloat(float[] arr, int p, int r, char[] s)
{
float x = arr[p];
int i = p - 1;
{
float x = arr[p];
int i = p - 1;
@@
-234,7
+234,7
@@
public class QuickSort
}
}
}
}
- static int partition(int[] arr, int p, int r, Object[] s)
+ static int partitionInt(int[] arr, int p, int r, Object[] s)
{
int x = arr[p];
int i = p - 1;
{
int x = arr[p];
int i = p - 1;
@@
-269,7
+269,7
@@
public class QuickSort
}
}
}
}
- static int partition(double[] arr, int p, int r, Object[] s)
+ static int partitionDouble(double[] arr, int p, int r, Object[] s)
{
double x = arr[p];
int i = p - 1;
{
double x = arr[p];
int i = p - 1;
@@
-346,7
+346,7
@@
public class QuickSort
* @param arr
* @param s
*/
* @param arr
* @param s
*/
- public static void sort(float[] arr, char[] s)
+ public static void sortFloat(float[] arr, char[] s)
{
/*
* Sort all zero values to the front
{
/*
* Sort all zero values to the front
@@
-449,14
+449,14
@@
public class QuickSort
return indices;
}
return indices;
}
- static void sort(float[] arr, int p, int r, char[] s)
+ static void sortFloat(float[] arr, int p, int r, char[] s)
{
int q;
if (p < r)
{
{
int q;
if (p < r)
{
- q = partition(arr, p, r, s);
- sort(arr, p, q, s);
- sort(arr, q + 1, r, s);
+ q = partitionFloat(arr, p, r, s);
+ sortFloat(arr, p, q, s);
+ sortFloat(arr, q + 1, r, s);
}
}
}
}
@@
-467,7
+467,7
@@
public class QuickSort
* @param arr
* @param s
*/
* @param arr
* @param s
*/
- public static void sort(int[] arr, char[] s)
+ public static void sortInt(int[] arr, char[] s)
{
/*
* Sort all zero values to the front
{
/*
* Sort all zero values to the front