andi/primitive-collections
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extract duplicate code that checks if the list is sorted

Browse Source
This commit is contained in:
Andreas Huber
2018-09-13 20:02:54 +02:00
parent 29e298dd35
commit b99021d0f7
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
primitiveCollections/src/main/java/org/lucares/collections/IntList.java
View File

@@ -356,10 +356,7 @@ public final class IntList implements Serializable, Cloneable {
size = size - (toIndex - fromIndex); size = size - (toIndex - fromIndex);
if (!sorted) { if (!sorted) {
sorted = true; checkIfSorted();
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
} }
} }
@@ -407,10 +404,7 @@ public final class IntList implements Serializable, Cloneable {
size = insertPosition; size = insertPosition;
if (!sorted) { if (!sorted) {
sorted = true; checkIfSorted();
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
} }
} }
@@ -561,11 +555,7 @@ public final class IntList implements Serializable, Cloneable {
data[i] = tmp; data[i] = tmp;
} }
// update sorted checkIfSorted();
sorted = true;
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
} }
private void ensureCapacity(final int newElements) { private void ensureCapacity(final int newElements) {
@@ -1062,4 +1052,11 @@ public final class IntList implements Serializable, Cloneable {
return unionSorted(aSorted, bSorted); return unionSorted(aSorted, bSorted);
} }
private void checkIfSorted() {
sorted = true;
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
}
} }

23
primitiveCollections/src/main/java/org/lucares/collections/LongList.java
View File

@@ -346,10 +346,7 @@ public final class LongList implements Serializable, Cloneable {
size = size - (toIndex - fromIndex); size = size - (toIndex - fromIndex);
if (!sorted) { if (!sorted) {
sorted = true; checkIfSorted();
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
} }
} }
@@ -397,10 +394,7 @@ public final class LongList implements Serializable, Cloneable {
size = insertPosition; size = insertPosition;
if (!sorted) { if (!sorted) {
sorted = true; checkIfSorted();
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
} }
} }
@@ -551,11 +545,7 @@ public final class LongList implements Serializable, Cloneable {
data[i] = tmp; data[i] = tmp;
} }
// update sorted checkIfSorted();
sorted = true;
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
} }
private void ensureCapacity(final int newElements) { private void ensureCapacity(final int newElements) {
@@ -1046,4 +1036,11 @@ public final class LongList implements Serializable, Cloneable {
return unionSorted(aSorted, bSorted); return unionSorted(aSorted, bSorted);
} }
private void checkIfSorted() {
sorted = true;
for (int i = 1; i < size && sorted; i++) {
sorted = data[i - 1] <= data[i];
}
}
} }