Better code, based off ParentRunner among other things

1 files changed, 11 insertions, 4 deletions

diff --git a/src/main/java/au/id/zancanaro/Generators.java b/src/main/java/au/id/zancanaro/Generators.java
index f065d1d..5b025fa 100644
--- a/src/main/java/au/id/zancanaro/Generators.java
+++ b/src/main/java/au/id/zancanaro/Generators.java
@@ -1,14 +1,21 @@
 package au.id.zancanaro;
 
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 public class Generators {
-    @SafeVarargs
-    public static <T> Generator<T[]> arrayGenerator(Generator<? extends T>... generators) {
-        return Generator.tuple((Generator<T>[]) generators);
+    public static <T> Generator<T> suchThat(Generator<T> gen, Predicate<T> pred) {
+        return (random, size) -> {
+            RoseTree<T> result = gen.generate(random, size);
+            if (pred.test(result.getValue())) {
+                return result.filter(pred);
+            } else {
+                return suchThat(gen, pred).generate(random, size);
+            }
+        };
     }
 
-    public static Generator<Integer> integerGenerator() {
+    public static Generator<Integer> integer() {
         return (random, size) -> {
             int value = random.nextInt(size);
             return new RoseTree<>(value, intShrinkingIterable(value));