add shuffle method

This commit is contained in:
2017-12-08 18:27:55 +01:00
parent c41e52f8b3
commit 29d4e49298
2 changed files with 63 additions and 2 deletions

View File

@@ -3,7 +3,9 @@ package org.lucares.collections;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random;
import java.util.Spliterator.OfInt; import java.util.Spliterator.OfInt;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
@@ -483,6 +485,35 @@ public final class IntList implements Serializable, Cloneable {
sorted = true; sorted = true;
} }
/**
* Shuffles the list. The permutation is uniformly distributed.
*/
public void shuffle() {
shuffle(ThreadLocalRandom.current());
}
/**
* Shuffles the list. The permutation is uniformly distributed.
*
* @param random
* the random number generator used
*/
public void shuffle(final Random random) {
/*
* See Knuth, Donald E. Seminumerical algorithms. (1998). The Art of Computer
* Programming. 2. AddisonWesley pp. 145146. Algorithm P and exercise 18.
*/
for (int i = size() - 1; i > 0; i--) {
final int other = random.nextInt(i);
final int tmp = data[other];
data[other] = data[i];
data[i] = tmp;
}
sorted = false;
}
private void ensureCapacity(final int newElements) { private void ensureCapacity(final int newElements) {
final int requiredCapacity = size + newElements; final int requiredCapacity = size + newElements;

View File

@@ -7,6 +7,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -488,8 +489,37 @@ public class IntListTest {
list.addAll(4, 2, 3, 1); list.addAll(4, 2, 3, 1);
list.sort(); list.sort();
final int[] expectedE = new int[] { 1, 2, 3, 4 }; final int[] expected = new int[] { 1, 2, 3, 4 };
Assert.assertArrayEquals(expectedE, list.toArray()); Assert.assertArrayEquals(expected, list.toArray());
}
@Test
public void testSortParallel() {
final IntList list = new IntList();
list.addAll(4, 2, 3, 1);
list.parallelSort();
final int[] expected = new int[] { 1, 2, 3, 4 };
Assert.assertArrayEquals(expected, list.toArray());
}
@Test
public void testShuffle() {
final IntList list = IntList.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
final IntList original = list.clone();
final IntList original2 = list.clone();
final Random random = new Random(1);
list.shuffle(random);
Assert.assertEquals(original.size(), list.size());
original.removeAll(list);
Assert.assertTrue("original minus shuffled list: " + original, original.isEmpty());
list.removeAll(original2);
Assert.assertTrue("shuffled list minus original: " + list, list.isEmpty());
} }
private int[] removeElements(final int[] data, final int... removedIndices) { private int[] removeElements(final int[] data, final int... removedIndices) {