Skip to content

Commit 0b767de

Browse files
PCBoyGamesPCBoyGames
committed
Bump upload-artifact version
1 parent 2dbb3a9 commit 0b767de

File tree

75 files changed

+1321
-1321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1321
-1321
lines changed

‎.github/workflows/ant.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
cd dist
3131
ant -noinput -buildfile build.xml
3232
- name: Upload artifact
33-
uses: actions/upload-artifact@v2
33+
uses: actions/upload-artifact@v4
3434
if: ${{ matrix.java == 8 && matrix.os == 'ubuntu-latest' }}
3535
with:
3636
name: standalone-jar

‎src/sorts/bogo/Bolosort.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ private boolean split(int[] array, int start, int split, int end) {
2222
if (start < split && split < end) {
2323
int k = start;
2424

25-
for(int i = start + 1; i < split; ++i) {
25+
for (int i = start + 1; i < split; ++i) {
2626
if (Reads.compareIndices(array, i, k, 0.025, true) > 0) {
2727
k = i;
2828
}
2929
}
3030

31-
for(int i = end - 1; i >= split; --i) {
31+
for (int i = end - 1; i >= split; --i) {
3232
if (Reads.compareIndices(array, i, k, 0.025, true) < 0) {
3333
return false;
3434
}
@@ -38,12 +38,12 @@ private boolean split(int[] array, int start, int split, int end) {
3838
}
3939
@Override
4040
public void runSort(int[] array, int sortLength, int bucketCount) {
41-
if(sortLength<2) return;
41+
if (sortLength<2) return;
4242
int z = sortLength/2;
4343
while(!isArraySorted(array, sortLength)) {
4444
while(!split(array, 0, z, sortLength)) {
4545
int a = randInt(0, z), b = randInt(z, sortLength);
46-
if(Reads.compareIndices(array, a, b, 1, true) > 0) {
46+
if (Reads.compareIndices(array, a, b, 1, true) > 0) {
4747
Writes.multiSwap(array, a, b, 0, false, false);
4848
} else {
4949
Writes.multiSwap(array, b, a, 0, false, false);

‎src/sorts/bogo/BoxoSort.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public BoxoSort(ArrayVisualizer arrayVisualizer) {
4949
}
5050

5151
private int selectiveSwap(int[] array, int length, boolean k) {
52-
if(length > 1 && ((!k)^this.isArraySorted(array, length)))
52+
if (length > 1 && ((!k)^this.isArraySorted(array, length)))
5353
return length+1;
5454
int rand = randInt(0, length),
5555
rand2 = randInt(rand, length);
@@ -68,7 +68,7 @@ public void runSort(int[] array, int length, int bucketCount) {
6868
while(!this.isArraySorted(array, length)) {
6969
k = this.selectiveSwap(array, k, d);
7070
d=!d;
71-
if(k <= 1 || k > length)
71+
if (k <= 1 || k > length)
7272
k = length;
7373
}
7474
}

‎src/sorts/bogo/LMRipbozoSort.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ public void runSort(int[] array, int length, int bucketCount) {
3232

3333
while(!isArraySorted(array, length)) {
3434
while(true) {
35-
for(int i=0; i<length; i++) {
35+
for (int i=0; i<length; i++) {
3636
Writes.write(swaps, 2*i, randInt(0, length), 0.05, true, true);
3737
Writes.write(swaps, 2*i+1, randInt(0, length), 0.05, true, true);
3838
Highlights.markArray(1, swaps[2*i]);
3939
Highlights.markArray(1, swaps[2*i+1]);
4040
}
4141

4242
boolean sorted = true;
43-
for(int i=0; i<length-1; i++) {
44-
for(int j=0; j<length; j++) {
43+
for (int i=0; i<length-1; i++) {
44+
for (int j=0; j<length; j++) {
4545
int inda = i == swaps[2*j] ? swaps[2*j+1] : i == swaps[2*j+1] ? swaps[2*j] : i,
4646
indb = (i+1) == swaps[2*j] ? swaps[2*j+1] : (i+1) == swaps[2*j+1] ? swaps[2*j] : (i+1);
4747
sorted = sorted && Reads.compareIndices(array, inda, indb, 0.005, true) <= 0;
4848
}
4949
}
50-
if(sorted) {
50+
if (sorted) {
5151
Writes.swap(array, randInt(0, length), randInt(0, length), 10, true, false);
5252
break;
5353
} else {
54-
for(int j=0; j<2*length; j+=2) {
54+
for (int j=0; j<2*length; j+=2) {
5555
Writes.swap(array, swaps[j], swaps[j+1], 1, true, false);
5656
}
5757
}

‎src/sorts/bogo/PlainDrunkSort.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public PlainDrunkSort(ArrayVisualizer arrayVisualizer) {
3030

3131
@Override
3232
public int validateAnswer(int answer) {
33-
if(answer < 0)
33+
if (answer < 0)
3434
return 0;
35-
if(answer > 99)
35+
if (answer > 99)
3636
return 100;
3737
return answer;
3838
}
@@ -48,11 +48,11 @@ protected boolean isRangeReversed(int[] array, int start, int end, boolean mark,
4848
}
4949

5050
private boolean drunkPass(int[] array, int a, int b, int luck, boolean invert) {
51-
if(a >= b - 1) return !invert;
51+
if (a >= b - 1) return !invert;
5252

53-
for(int i = a + 1; i <= b; i++) {
54-
for(int j = 0; invert?!isRangeReversed(array, a, i, true, false):!isRangeSorted(array, a, i); ) {
55-
if(Reads.compareIndices(array, a + j, a + (j + 1) % (i - a), 0.5, true) > 0 ^ invert) {
53+
for (int i = a + 1; i <= b; i++) {
54+
for (int j = 0; invert?!isRangeReversed(array, a, i, true, false):!isRangeSorted(array, a, i); ) {
55+
if (Reads.compareIndices(array, a + j, a + (j + 1) % (i - a), 0.5, true) > 0 ^ invert) {
5656
invert ^= (randInt(0, 101) > luck);
5757
Writes.swap(array, a + j, a + (j + 1) % (i - a), 0.5, true, false);
5858
}

‎src/sorts/bogo/QMRipbozoSort.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void runSort(int[] array, int length, int bucketCount) {
3333

3434
ArrayList<int[]> p = new ArrayList<>();
3535

36-
for(int i=n; i>0; i--) {
36+
for (int i=n; i>0; i--) {
3737
p.add(Writes.createExternalArray(length));
3838
}
3939

@@ -45,16 +45,16 @@ public void runSort(int[] array, int length, int bucketCount) {
4545
while(!isArraySorted(array, length)) {
4646
packwatch:
4747
while(true) {
48-
for(int i=0; i<length; i++) {
48+
for (int i=0; i<length; i++) {
4949
Writes.arraycopy(array, 0, f[i], 0, length, 0.005, true, true);
5050
Writes.write(swaps, 2*i, randInt(0, length), 0.05, true, true);
5151
Writes.write(swaps, 2*i+1, randInt(0, length), 0.05, true, true);
5252
Writes.swap(f[i], swaps[2*i], swaps[2*i+1], 0.05, true, true);
5353
}
5454

55-
for(int i=0; i<length; i++) {
56-
if(!isArraySorted(f[i], length)) {
57-
for(int j=0; j<2*length; j+=2) {
55+
for (int i=0; i<length; i++) {
56+
if (!isArraySorted(f[i], length)) {
57+
for (int j=0; j<2*length; j+=2) {
5858
Writes.swap(array, swaps[j], swaps[j+1], 0.05, true, false);
5959
}
6060
continue packwatch;

‎src/sorts/bogo/ZogoSort.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private void semiShuffle3(int[] array, int length) {
3535

3636
Writes.swap(array, rand, head, 0.05, true, false);
3737
Writes.swap(array, rand, tail, 0.05, true, false);
38-
if(randBoolean())
38+
if (randBoolean())
3939
Writes.swap(array, rand, head, 0.05, true, false);
4040
}
4141

‎src/sorts/concurrent/AKSSortingNetwork.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -97,48 +97,48 @@ private void writeInterval(int[][] tree, int i, int a, int b, int c, int d) {
9797
}
9898

9999
private void compSwap(int[] array, int[] map, int a, int b) {
100-
if(map[b] < this.end && Reads.compareIndices(array, map[a], map[b], SLEEP, true) > 0)
100+
if (map[b] < this.end && Reads.compareIndices(array, map[a], map[b], SLEEP, true) > 0)
101101
Writes.swap(array, map[a], map[b], SLEEP, false, false);
102102
}
103103

104104
private void smallSort(int[] array, int[] map, int a, int b) { // creasesort for compactness
105-
if(b-a < 2) return;
105+
if (b-a < 2) return;
106106

107107
int n = (1 << 31-Integer.numberOfLeadingZeros(b-a-1)) - 1;
108108

109-
for(int k = 2*n; k > 0; k /= 2) {
110-
for(int i = a+1; i < b; i += 2)
109+
for (int k = 2*n; k > 0; k /= 2) {
110+
for (int i = a+1; i < b; i += 2)
111111
this.compSwap(array, map, i-1, i);
112-
for(int j = n; j >= Math.max(k/2, 1); j /= 2)
113-
for(int i = a+1+j; i < b; i += 2)
112+
for (int j = n; j >= Math.max(k/2, 1); j /= 2)
113+
for (int i = a+1+j; i < b; i += 2)
114114
this.compSwap(array, map, i-j, i);
115115
}
116116
}
117117

118118
private void epsHalver(int[] array, int[] map, int[] idx, Random r, int a, int m, int h, boolean odd) {
119-
for(int k = HALVER_DEPTH-2; k > 0; k--) {
120-
for(int i = 0; i < h; i++) {
119+
for (int k = HALVER_DEPTH-2; k > 0; k--) {
120+
for (int i = 0; i < h; i++) {
121121
int j = r.nextInt(i+1);
122122
idx[i] = idx[j];
123123
idx[j] = i;
124124
Writes.changeAuxWrites(2);
125125
}
126-
for(int i = 0, s; i < h; i++)
127-
if((s = idx[i]) < h-1 || !odd)
126+
for (int i = 0, s; i < h; i++)
127+
if ((s = idx[i]) < h-1 || !odd)
128128
this.compSwap(array, map, a+i, m+s);
129129
}
130-
for(int i = 0, s; i < h; i++)
131-
if((s = i) < h-1 || !odd)
130+
for (int i = 0, s; i < h; i++)
131+
if ((s = i) < h-1 || !odd)
132132
this.compSwap(array, map, a+i, m+s);
133133

134-
for(int i = 0, s; i < h; i++)
135-
if((s = (i+1)%h) < h-1 || !odd)
134+
for (int i = 0, s; i < h; i++)
135+
if ((s = (i+1)%h) < h-1 || !odd)
136136
this.compSwap(array, map, a+i, m+s);
137137
}
138138

139139
private void epsNearsort(int[] array, int[] map, int[] idx, Random r, int a, int n, int d) {
140-
if(n <= MIN_SORT || d >= NEARSORT_DEPTH) {
141-
if(n <= MIN_SORT) this.smallSort(array, map, a, a+n);
140+
if (n <= MIN_SORT || d >= NEARSORT_DEPTH) {
141+
if (n <= MIN_SORT) this.smallSort(array, map, a, a+n);
142142
return;
143143
}
144144

@@ -160,7 +160,7 @@ private void cherry(int[] array, int[] map, int[] idx, Random rand, int[][] tree
160160

161161
int l = 2*root + 1, r = l+1;
162162

163-
if(l < tSize) { // if left and right child nodes exist
163+
if (l < tSize) { // if left and right child nodes exist
164164
j = this.mapInt(map, tree[l], 0, j);
165165
j = this.mapInt(map, tree[l], 1, j);
166166
j = this.mapInt(map, tree[r], 0, j);
@@ -173,28 +173,28 @@ private void cherry(int[] array, int[] map, int[] idx, Random rand, int[][] tree
173173
private void zig(int[] array, int[] map, int[] idx, Random rand, int[][] tree, int t) {
174174
int tSize = (2 << t) - 1;
175175

176-
for(int i = 1; i <= tSize; i = 4*i + 3)
177-
for(int j = i/2; j < i; j++)
176+
for (int i = 1; i <= tSize; i = 4*i + 3)
177+
for (int j = i/2; j < i; j++)
178178
this.cherry(array, map, idx, rand, tree, j, tSize);
179179
}
180180
private void zag(int[] array, int[] map, int[] idx, Random rand, int[][] tree, int t) {
181181
this.epsNearsort(array, map, idx, rand, 0, mapInt(map, tree[0], 1, mapInt(map, tree[0], 0, 0)), 0);
182182

183183
int tSize = (2 << t) - 1;
184184

185-
for(int i = 3; i <= tSize; i = 4*i + 3)
186-
for(int j = i/2; j < i; j++)
185+
for (int i = 3; i <= tSize; i = 4*i + 3)
186+
for (int j = i/2; j < i; j++)
187187
this.cherry(array, map, idx, rand, tree, j, tSize);
188188
}
189189

190190
@Override
191191
public void runSort(int[] array, int length, int bucketCount) {
192192
this.end = length;
193193

194-
if(length <= MIN_SORT) {
194+
if (length <= MIN_SORT) {
195195
int[] map = Writes.createExternalArray(length);
196196

197-
for(int i = 0; i < length; i++)
197+
for (int i = 0; i < length; i++)
198198
Writes.write(map, i, i, 0, false, true);
199199

200200
this.smallSort(array, map, 0, length);
@@ -218,9 +218,9 @@ public void runSort(int[] array, int length, int bucketCount) {
218218
boolean minSort = false;
219219

220220
sortLoop:
221-
for(int t = 1; t < logN; t++) { // O(log n)
222-
for(int i = 0, k = 0; i <= t; i++) {
223-
for(int j = 0, s = N >> i; !minSort && j < (1<<i); j++) {
221+
for (int t = 1; t < logN; t++) { // O(log n)
222+
for (int i = 0, k = 0; i <= t; i++) {
223+
for (int j = 0, s = N >> i; !minSort && j < (1<<i); j++) {
224224
int p = j * s,
225225
l1 = p + (j%2 == 1 ? 0 : Y(i,t)),
226226
l2 = p + Y(i+1,t),
@@ -229,18 +229,18 @@ public void runSort(int[] array, int length, int bucketCount) {
229229

230230
minSort |= (l2-l1 == 0 && s <= MIN_SORT); // detects when aks sorts elements
231231
// with a distance <= MIN_SORT
232-
if(i == t) l2 = r1 = r2;
232+
if (i == t) l2 = r1 = r2;
233233

234-
if(minSort) {
235-
for(k = 0; k < s; k++) Writes.write(map, k, p+k, 0, false, true);
234+
if (minSort) {
235+
for (k = 0; k < s; k++) Writes.write(map, k, p+k, 0, false, true);
236236
this.smallSort(array, map, 0, s);
237237
}
238238
else this.writeInterval(tree, k++, l1, l2, r1, r2);
239239
}
240-
if(minSort) break sortLoop;
240+
if (minSort) break sortLoop;
241241
}
242-
for(int i = 0; i < ZIG_ZAG_ITER; i++) {
243-
if(i%2 == 1) this.zag(array, map, idx, r, tree, t);
242+
for (int i = 0; i < ZIG_ZAG_ITER; i++) {
243+
if (i%2 == 1) this.zag(array, map, idx, r, tree, t);
244244
else this.zig(array, map, idx, r, tree, t);
245245
}
246246
}

‎src/sorts/concurrent/BitonicSortRecIterative.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ private void bitonicSort(int[] A, int lo, int n, boolean dir)
3737
this.bitonicSort(A, lo + m, n - m, dir);
3838

3939
int g = 1 << (31 - Integer.numberOfLeadingZeros(n - 1));
40-
for(int j = g; j > 0; j /= 2) {
41-
for(int i = 0; i < n; i++) {
42-
if(i % (j * 2) < j && (i + j) < n && (dir ^ Reads.compareIndices(A, lo + i, lo + i + j, 1, true) > 0)) {
40+
for (int j = g; j > 0; j /= 2) {
41+
for (int i = 0; i < n; i++) {
42+
if (i % (j * 2) < j && (i + j) < n && (dir ^ Reads.compareIndices(A, lo + i, lo + i + j, 1, true) > 0)) {
4343
Writes.swap(A, lo + i, lo + i + j, 1, true, false);
4444
}
4545
}

‎src/sorts/concurrent/DupeSort.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ final public class DupeSort extends Sort {
77

88
public DupeSort(ArrayVisualizer arrayVisualizer) {
99
super(arrayVisualizer);
10-
10+
1111
this.setSortListName("Dupe");
1212
this.setRunAllSortsName("Dupe Sorting Network");
1313
this.setRunSortName("Dupe Sorting Network");
@@ -19,13 +19,13 @@ public DupeSort(ArrayVisualizer arrayVisualizer) {
1919
this.setUnreasonableLimit(0);
2020
this.setBogoSort(false);
2121
}
22-
22+
2323
private void compSwap(int[] array, int a, int b) {
24-
if(a < b && Reads.compareIndices(array, a, b, 1, true) > 0) {
24+
if (a < b && Reads.compareIndices(array, a, b, 1, true) > 0) {
2525
Writes.swap(array, a, b, 1, true, false);
2626
}
2727
}
28-
28+
2929
private int bitreverse(int val, int log) {
3030
int v = 0;
3131
while(log > 0) {
@@ -34,16 +34,16 @@ private int bitreverse(int val, int log) {
3434
}
3535
return v;
3636
}
37-
37+
3838
@Override
3939
public void runSort(int[] array, int length, int bucketCount) throws Exception {
40-
for(int i = 1, p = 0, q = 0;; i++) {
41-
if(2<<p==i) {q=++p;if(1<<p>=2*length)break;}
42-
if(i==(1<<p)+(1<<(p-q))){q--;if(q!=p-1)continue;}
40+
for (int i = 1, p = 0, q = 0;; i++) {
41+
if (2<<p==i) {q=++p;if (1<<p>=2*length)break;}
42+
if (i==(1<<p)+(1<<(p-q))) {q--;if (q!=p-1)continue;}
4343
int k = bitreverse(i, p);
44-
for(int j = 0; j < length; j++) {
44+
for (int j = 0; j < length; j++) {
4545
int t = j ^ k;
46-
if(t<length && t-j == 1<<q) compSwap(array, j, t);
46+
if (t<length && t-j == 1<<q) compSwap(array, j, t);
4747
}
4848
}
4949
}

0 commit comments

Comments
 (0)