Shuffles.

cao-awa · Oct 6, 2024 · d07a107 · d07a107
1 parent 1ab32b9
commit d07a107
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
-version_name=1.0.38
+version_name=1.0.39
 artifact_id=catheter
 group_id=com.github.cao.awa
diff --git a/src/main/java/com/github/cao/awa/catheter/BooleanCatheter.java b/src/main/java/com/github/cao/awa/catheter/BooleanCatheter.java
@@ -15,6 +15,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.*;
+import java.util.random.RandomGenerator;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
@@ -1168,6 +1169,27 @@ public BooleanCatheter shuffle() {
         return this;
     }
 
+    public BooleanCatheter shuffle(RandomGenerator random) {
+        sort((t1, t2) -> RANDOM.nextInt());
+        return this;
+    }
+
+    public BooleanCatheter swapShuffle(RandomGenerator random) {
+        boolean[] elements = this.targets;
+        int i = elements.length;
+
+        for (int j = i; j > 1; --j) {
+            int swapTo = random.nextInt(j);
+            int swapFrom = j - 1;
+            boolean fromElement = elements[swapFrom];
+            boolean toElement = elements[swapTo];
+            elements[swapTo] = fromElement;
+            elements[swapFrom] = toElement;
+        }
+
+        return this;
+    }
+
     public BooleanCatheter dump() {
         return new BooleanCatheter(array());
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/ByteCatheter.java b/src/main/java/com/github/cao/awa/catheter/ByteCatheter.java
@@ -15,6 +15,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.*;
+import java.util.random.RandomGenerator;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -1172,6 +1173,27 @@ public ByteCatheter shuffle() {
         return this;
     }
 
+    public ByteCatheter shuffle(RandomGenerator random) {
+        sort((t1, t2) -> RANDOM.nextInt());
+        return this;
+    }
+
+    public ByteCatheter swapShuffle(RandomGenerator random) {
+        byte[] elements = this.targets;
+        int i = elements.length;
+
+        for (int j = i; j > 1; --j) {
+            int swapTo = random.nextInt(j);
+            int swapFrom = j - 1;
+            byte fromElement = elements[swapFrom];
+            byte toElement = elements[swapTo];
+            elements[swapTo] = fromElement;
+            elements[swapFrom] = toElement;
+        }
+
+        return this;
+    }
+
     public ByteCatheter dump() {
         return new ByteCatheter(array());
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/Catheter.java b/src/main/java/com/github/cao/awa/catheter/Catheter.java
@@ -15,6 +15,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.*;
+import java.util.random.RandomGenerator;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
@@ -1641,6 +1642,27 @@ public Catheter<T> shuffle() {
         return this;
     }
 
+    public Catheter<T> shuffle(RandomGenerator random) {
+        sort((t1, t2) -> RANDOM.nextInt());
+        return this;
+    }
+
+    public Catheter<T> swapShuffle(RandomGenerator random) {
+        T[] elements = this.targets;
+        int i = elements.length;
+
+        for (int j = i; j > 1; --j) {
+            int swapTo = random.nextInt(j);
+            int swapFrom = j - 1;
+            T fromElement = elements[swapFrom];
+            T toElement = elements[swapTo];
+            elements[swapTo] = fromElement;
+            elements[swapFrom] = toElement;
+        }
+
+        return this;
+    }
+
     public Catheter<T> dump() {
         return new Catheter<>(array());
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/DoubleCatheter.java b/src/main/java/com/github/cao/awa/catheter/DoubleCatheter.java
@@ -15,6 +15,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.*;
+import java.util.random.RandomGenerator;
 import java.util.stream.DoubleStream;
 import java.util.stream.LongStream;
 
@@ -1146,6 +1147,27 @@ public DoubleCatheter shuffle() {
         return this;
     }
 
+    public DoubleCatheter shuffle(RandomGenerator random) {
+        sort((t1, t2) -> RANDOM.nextInt());
+        return this;
+    }
+
+    public DoubleCatheter swapShuffle(RandomGenerator random) {
+        double[] elements = this.targets;
+        int i = elements.length;
+
+        for (int j = i; j > 1; --j) {
+            int swapTo = random.nextInt(j);
+            int swapFrom = j - 1;
+            double fromElement = elements[swapFrom];
+            double toElement = elements[swapTo];
+            elements[swapTo] = fromElement;
+            elements[swapFrom] = toElement;
+        }
+
+        return this;
+    }
+
     public boolean isPresent() {
         return count() > 0;
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/IntCatheter.java b/src/main/java/com/github/cao/awa/catheter/IntCatheter.java
@@ -14,6 +14,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.*;
+import java.util.random.RandomGenerator;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 
@@ -1165,6 +1166,27 @@ public IntCatheter shuffle() {
         return this;
     }
 
+    public IntCatheter shuffle(RandomGenerator random) {
+        sort((t1, t2) -> RANDOM.nextInt());
+        return this;
+    }
+
+    public IntCatheter swapShuffle(RandomGenerator random) {
+        int[] elements = this.targets;
+        int i = elements.length;
+
+        for (int j = i; j > 1; --j) {
+            int swapTo = random.nextInt(j);
+            int swapFrom = j - 1;
+            int fromElement = elements[swapFrom];
+            int toElement = elements[swapTo];
+            elements[swapTo] = fromElement;
+            elements[swapFrom] = toElement;
+        }
+
+        return this;
+    }
+
     public IntCatheter dump() {
         return new IntCatheter(array());
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/LongCatheter.java b/src/main/java/com/github/cao/awa/catheter/LongCatheter.java
@@ -14,6 +14,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.*;
+import java.util.random.RandomGenerator;
 import java.util.stream.LongStream;
 
 public class LongCatheter {
@@ -1173,6 +1174,27 @@ public LongCatheter shuffle() {
         return this;
     }
 
+    public LongCatheter shuffle(RandomGenerator random) {
+        sort((t1, t2) -> RANDOM.nextInt());
+        return this;
+    }
+
+    public LongCatheter swapShuffle(RandomGenerator random) {
+        long[] elements = this.targets;
+        int i = elements.length;
+
+        for (int j = i; j > 1; --j) {
+            int swapTo = random.nextInt(j);
+            int swapFrom = j - 1;
+            long fromElement = elements[swapFrom];
+            long toElement = elements[swapTo];
+            elements[swapTo] = fromElement;
+            elements[swapFrom] = toElement;
+        }
+
+        return this;
+    }
+
     public LongCatheter dump() {
         return new LongCatheter(array());
     }