Merge pull request #1519 from finos/1517-random-upperbound-functionality

1517 random upperbound functionality
finos · Nov 7, 2019 · f8b7fe7 · f8b7fe7
2 parents 63fa581 + a9a969b
commit f8b7fe7
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 65 deletions.
diff --git a/common/src/main/java/com/scottlogic/deg/common/profile/DateTimeGranularity.java b/common/src/main/java/com/scottlogic/deg/common/profile/DateTimeGranularity.java
@@ -82,7 +82,7 @@ public OffsetDateTime getPrevious(OffsetDateTime value) {
 
     @Override
     public OffsetDateTime getRandom(OffsetDateTime min, OffsetDateTime max, RandomNumberGenerator randomNumberGenerator) {
-        long generatedLong = (long) randomNumberGenerator.nextDouble(getMilli(min), getMilli(max));
+        long generatedLong = randomNumberGenerator.nextLong(getMilli(min), getMilli(max));
 
         OffsetDateTime generatedDate = Instant.ofEpochMilli(generatedLong).atZone(ZoneOffset.UTC).toOffsetDateTime();
 

diff --git a/common/src/main/java/com/scottlogic/deg/generator/utils/RandomNumberGenerator.java b/common/src/main/java/com/scottlogic/deg/generator/utils/RandomNumberGenerator.java
@@ -21,7 +21,7 @@
 public interface RandomNumberGenerator {
     int nextInt();
     int nextInt(int bound);
-    int nextInt(int lowerInclusive, int upperExclusive);
+    long nextLong(long lowerInclusive, long upperInclusive);
     double nextDouble(double lowerInclusive, double upperExclusive);
     BigDecimal nextBigDecimal(BigDecimal lowerInclusive, BigDecimal upperExclusive);
 }
diff --git a/common/src/test/java/com/scottlogic/deg/testUtils/TestRandomNumberGenerator.java b/common/src/test/java/com/scottlogic/deg/testUtils/TestRandomNumberGenerator.java
@@ -39,8 +39,9 @@ public int nextInt(int bound) {
     }
 
     @Override
-    public int nextInt(int lowerInclusive, int upperExclusive) {
-        return 0;
+    public long nextLong(long lowerInclusive, long upperExclusive) {
+        long multiplier = (long) (nextDoubleValue * (double) (upperExclusive - lowerInclusive));
+        return multiplier + lowerInclusive;
     }
 
     @Override
@@ -50,6 +51,6 @@ public double nextDouble(double lower, double upper) {
 
     @Override
     public BigDecimal nextBigDecimal(BigDecimal lowerInclusive, BigDecimal upperExclusive) {
-        return new BigDecimal(nextDouble(lowerInclusive.doubleValue(), upperExclusive.doubleValue()));
+        return BigDecimal.valueOf(nextDouble(lowerInclusive.doubleValue(), upperExclusive.doubleValue()));
     }
 }
diff --git a/...ava/com/scottlogic/deg/generator/generation/fieldvaluesources/LinearFieldValueSource.java b/...ava/com/scottlogic/deg/generator/generation/fieldvaluesources/LinearFieldValueSource.java
@@ -54,7 +54,10 @@ public Stream<T> generateInterestingValues() {
     @Override
     public Stream<T> generateRandomValues(RandomNumberGenerator randomNumberGenerator) {
         return Stream.generate(() -> restrictions.getGranularity()
-                .getRandom(restrictions.getMin(), restrictions.getMax(), randomNumberGenerator))
+                .getRandom(
+                    restrictions.getMin(),
+                    restrictions.getGranularity().getNext(restrictions.getMax()),
+                    randomNumberGenerator))
             .filter(this::notInBlacklist);
     }
 

diff --git a/...rator/src/main/java/com/scottlogic/deg/generator/utils/JavaUtilRandomNumberGenerator.java b/...rator/src/main/java/com/scottlogic/deg/generator/utils/JavaUtilRandomNumberGenerator.java
@@ -17,7 +17,6 @@
 package com.scottlogic.deg.generator.utils;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.Random;
 
 public class JavaUtilRandomNumberGenerator implements RandomNumberGenerator {
@@ -42,37 +41,23 @@ public int nextInt(int bound) {
     }
 
     @Override
-    public int nextInt(int lowerInclusive, int upperExclusive) {
-        // implementation copied from Random::internalNextInt
-        if (lowerInclusive < upperExclusive) {
-            int n = upperExclusive - lowerInclusive;
-            if (n > 0) {
-                return nextInt(n) + lowerInclusive;
-            }
-            else {  // range not representable as int
-                int r;
-                do {
-                    r = nextInt();
-                } while (r < lowerInclusive || r >= upperExclusive);
-                return r;
-            }
-        }
-        else {
-            return nextInt();
-        }
+    public long nextLong(long lowerInclusive, long upperExclusive) {
+        long multiplier = (long) (random.nextDouble() * (double) (upperExclusive - lowerInclusive));
+        return multiplier + lowerInclusive;
     }
 
     @Override
     public double nextDouble(double lowerInclusive, double upperExclusive) {
-        return random.nextDouble()
-            * (upperExclusive - lowerInclusive)
+        return (random.nextDouble()
+            * (upperExclusive - lowerInclusive))
             + lowerInclusive;
     }
 
     @Override
     public BigDecimal nextBigDecimal(BigDecimal lowerInclusive, BigDecimal upperExclusive) {
-        return new BigDecimal(random.nextDouble())
+        return BigDecimal.valueOf(random.nextDouble())
             .multiply(upperExclusive.subtract(lowerInclusive))
             .add(lowerInclusive);
     }
+
 }
diff --git a/...com/scottlogic/deg/generator/generation/fieldvaluesources/LinearFieldValueSourceTest.java b/...com/scottlogic/deg/generator/generation/fieldvaluesources/LinearFieldValueSourceTest.java
@@ -0,0 +1,29 @@
+package com.scottlogic.deg.generator.generation.fieldvaluesources;
+
+import com.scottlogic.deg.common.profile.NumericGranularity;
+import com.scottlogic.deg.generator.restrictions.linear.LinearRestrictions;
+import com.scottlogic.deg.generator.utils.JavaUtilRandomNumberGenerator;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class LinearFieldValueSourceTest {
+
+    @Test
+    public void testGenerateRandomValues() {
+        LinearRestrictions<BigDecimal> restrictions = new LinearRestrictions<>(
+            BigDecimal.ZERO,
+            BigDecimal.valueOf(4),
+            new NumericGranularity(0));
+        LinearFieldValueSource<BigDecimal> source = new LinearFieldValueSource<>(restrictions, Collections.emptySet());
+
+        Stream<BigDecimal> results = source.generateRandomValues(new JavaUtilRandomNumberGenerator());
+
+        assertTrue(results.limit(100).allMatch(x -> x.intValue() >= 0 & x.intValue() < 5));
+    }
+
+}