Mercurial > hg > Database > Alice
diff src/main/java/alice/test/codesegment/local/bitonicsort/DataList.java @ 467:6e304a7a60e7 dispose
remove white space
author | sugi |
---|---|
date | Sat, 22 Nov 2014 12:08:24 +0900 |
parents | aefbe41fcf12 |
children |
line wrap: on
line diff
--- a/src/main/java/alice/test/codesegment/local/bitonicsort/DataList.java Sat Nov 15 04:48:35 2014 +0900 +++ b/src/main/java/alice/test/codesegment/local/bitonicsort/DataList.java Sat Nov 22 12:08:24 2014 +0900 @@ -25,7 +25,7 @@ } public void swap(int i, int j){ - int tmp = table[i]; + int tmp = table[i]; table[i] = table[j]; table[j] = tmp; } @@ -54,22 +54,22 @@ } public static void merge(DataList list1, DataList list2) { - int[] t1 = list1.table; - int[] t2 = list2.table; + int[] t1 = list1.table; + int[] t2 = list2.table; int[] t0 = list1.table.clone(); // copy to avoid destroy t1 int i = 0, j= 0,n=0; while (i< t0.length) { if (n>=t1.length) { // switch to the second list t1 = t2; n = 0; } - if (j>=t2.length || t0[i] < t2[j]) { + if (j>=t2.length || t0[i] < t2[j]) { t1[n] = t0[i]; // including when j reaches end of t2 i++; n++; } else { t1[n] = t2[j]; j++; n++; } - } + } } }