This is an automated email from the ASF dual-hosted git repository. aherbert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit 8c92e3691f1bf51a8748f59e7f4a372abed0ba28 Author: Alex Herbert <aherb...@apache.org> AuthorDate: Wed Jul 3 14:49:48 2024 +0100 Remove modification of x inline --- .../java/org/apache/commons/rng/simple/internal/Conversions.java | 6 ++++-- .../java/org/apache/commons/rng/simple/internal/SeedFactory.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/Conversions.java b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/Conversions.java index a09784c6..8595f214 100644 --- a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/Conversions.java +++ b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/Conversions.java @@ -171,7 +171,8 @@ final class Conversions { // Process pairs final int n = length & ~0x1; for (int i = 0; i < n; i += 2) { - final long x = MixFunctions.stafford13(v += GOLDEN_RATIO); + v += GOLDEN_RATIO; + final long x = MixFunctions.stafford13(v); output[i] = (int) x; output[i + 1] = (int) (x >>> 32); } @@ -195,7 +196,8 @@ final class Conversions { long v = input; final long[] output = new long[length]; for (int i = 0; i < length; i++) { - output[i] = MixFunctions.stafford13(v += GOLDEN_RATIO); + v += GOLDEN_RATIO; + output[i] = MixFunctions.stafford13(v); } return output; } diff --git a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/SeedFactory.java b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/SeedFactory.java index 5139125f..eac85a3a 100644 --- a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/SeedFactory.java +++ b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/SeedFactory.java @@ -290,7 +290,8 @@ public final class SeedFactory { // to be non-zero. This is ensured if the start is even since the increment is odd. int x = createInt() << 1; for (int i = from; i < to; i++) { - seed[i] = MixFunctions.murmur3(x += MixFunctions.GOLDEN_RATIO_32); + x += MixFunctions.GOLDEN_RATIO_32; + seed[i] = MixFunctions.murmur3(x); } } @@ -326,7 +327,8 @@ public final class SeedFactory { // to be non-zero. This is ensured if the start is even since the increment is odd. long x = createLong() << 1; for (int i = from; i < to; i++) { - seed[i] = MixFunctions.stafford13(x += MixFunctions.GOLDEN_RATIO_64); + x += MixFunctions.GOLDEN_RATIO_64; + seed[i] = MixFunctions.stafford13(x); } }