You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2019/09/18 16:51:21 UTC
[commons-rng] branch master updated (c4f0d3c -> e34eb81)
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git.
from c4f0d3c Moved downgrade of felix version to the pre-Java 8 profile.
new 27a2f76 Renamed SFC generators to DotyHumphreySmallFastCounting.
new e34eb81 Renamed JSF generators to JenkinsSmallFast.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...2.java => DotyHumphreySmallFastCounting32.java} | 6 +++---
.../{JSF32.java => JenkinsSmallFast32.java} | 4 ++--
...4.java => DotyHumphreySmallFastCounting64.java} | 6 +++---
.../{JSF64.java => JenkinsSmallFast64.java} | 4 ++--
.../org/apache/commons/rng/core/ProvidersList.java | 16 +++++++--------
...va => DotyHumphreySmallFastCounting32Test.java} | 4 ++--
...{JSF32Test.java => JenkinsSmallFast32Test.java} | 4 ++--
...va => DotyHumphreySmallFastCounting64Test.java} | 4 ++--
...{JSF64Test.java => JenkinsSmallFast64Test.java} | 4 ++--
.../apache/commons/rng/simple/RandomSource.java | 8 ++++----
.../rng/simple/internal/ProviderBuilder.java | 24 +++++++++++-----------
src/changes/changes.xml | 4 ++--
src/site/resources/txt/userguide/stress/dh_34_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_5 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_5 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_5 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_5 | 2 +-
52 files changed, 84 insertions(+), 84 deletions(-)
rename commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/{SFC32.java => DotyHumphreySmallFastCounting32.java} (93%)
rename commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/{JSF32.java => JenkinsSmallFast32.java} (96%)
rename commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/{SFC64.java => DotyHumphreySmallFastCounting64.java} (93%)
rename commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/{JSF64.java => JenkinsSmallFast64.java} (96%)
rename commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/{SFC32Test.java => DotyHumphreySmallFastCounting32Test.java} (92%)
rename commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/{JSF32Test.java => JenkinsSmallFast32Test.java} (93%)
rename commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/{SFC64Test.java => DotyHumphreySmallFastCounting64Test.java} (93%)
rename commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/{JSF64Test.java => JenkinsSmallFast64Test.java} (94%)
[commons-rng] 02/02: Renamed JSF generators to JenkinsSmallFast.
Posted by ah...@apache.org.
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 e34eb8138680c008d6e35e7988771e60e1d8de9e
Author: aherbert <ah...@apache.org>
AuthorDate: Tue Sep 17 16:55:37 2019 +0100
Renamed JSF generators to JenkinsSmallFast.
---
.../core/source32/{JSF32.java => JenkinsSmallFast32.java} | 4 ++--
.../core/source64/{JSF64.java => JenkinsSmallFast64.java} | 4 ++--
.../test/java/org/apache/commons/rng/core/ProvidersList.java | 8 ++++----
.../source32/{JSF32Test.java => JenkinsSmallFast32Test.java} | 4 ++--
.../source64/{JSF64Test.java => JenkinsSmallFast64Test.java} | 4 ++--
.../java/org/apache/commons/rng/simple/RandomSource.java | 4 ++--
.../apache/commons/rng/simple/internal/ProviderBuilder.java | 12 ++++++------
src/changes/changes.xml | 2 +-
src/site/resources/txt/userguide/stress/dh_36_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_36_5 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_37_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_36_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_37_5 | 2 +-
28 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/JSF32.java b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/JenkinsSmallFast32.java
similarity index 96%
rename from commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/JSF32.java
rename to commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/JenkinsSmallFast32.java
index 47d6db6..54459e5 100644
--- a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/JSF32.java
+++ b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/JenkinsSmallFast32.java
@@ -28,7 +28,7 @@ import org.apache.commons.rng.core.util.NumberFactory;
*
* @since 1.3
*/
-public class JSF32 extends IntProvider {
+public class JenkinsSmallFast32 extends IntProvider {
/** State a. */
private int a;
/** State b. */
@@ -43,7 +43,7 @@ public class JSF32 extends IntProvider {
*
* @param seed Initial seed.
*/
- public JSF32(Integer seed) {
+ public JenkinsSmallFast32(Integer seed) {
setSeedInternal(seed);
}
diff --git a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/JSF64.java b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/JenkinsSmallFast64.java
similarity index 96%
rename from commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/JSF64.java
rename to commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/JenkinsSmallFast64.java
index 411cb00..bb935b0 100644
--- a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/JSF64.java
+++ b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/JenkinsSmallFast64.java
@@ -27,7 +27,7 @@ import org.apache.commons.rng.core.util.NumberFactory;
*
* @since 1.3
*/
-public class JSF64 extends LongProvider {
+public class JenkinsSmallFast64 extends LongProvider {
/** State a. */
private long a;
/** State b. */
@@ -42,7 +42,7 @@ public class JSF64 extends LongProvider {
*
* @param seed Initial seed.
*/
- public JSF64(Long seed) {
+ public JenkinsSmallFast64(Long seed) {
setSeedInternal(seed);
}
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
index 242a0ac..9995df2 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.security.SecureRandom;
import org.apache.commons.rng.core.source32.JDKRandom;
-import org.apache.commons.rng.core.source32.JSF32;
+import org.apache.commons.rng.core.source32.JenkinsSmallFast32;
import org.apache.commons.rng.core.source32.Well512a;
import org.apache.commons.rng.core.source32.XoRoShiRo64Star;
import org.apache.commons.rng.core.source32.XoRoShiRo64StarStar;
@@ -53,7 +53,7 @@ import org.apache.commons.rng.core.source64.XoShiRo256Plus;
import org.apache.commons.rng.core.source64.XoShiRo256StarStar;
import org.apache.commons.rng.core.source64.XoShiRo512Plus;
import org.apache.commons.rng.core.source64.XoShiRo512StarStar;
-import org.apache.commons.rng.core.source64.JSF64;
+import org.apache.commons.rng.core.source64.JenkinsSmallFast64;
import org.apache.commons.rng.core.source64.MersenneTwister64;
import org.apache.commons.rng.core.source64.PcgRxsMXs64;
import org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64;
@@ -111,7 +111,7 @@ public final class ProvidersList {
// Ensure a high complexity increment is used for the Weyl sequence
add(LIST32, new MiddleSquareWeylSequence(new long[] {g.nextLong(), g.nextLong(), 0xb5ad4eceda1ce2a9L}));
add(LIST32, new DotyHumphreySmallFastCounting32(new int[] {g.nextInt(), g.nextInt()}));
- add(LIST32, new JSF32(g.nextInt()));
+ add(LIST32, new JenkinsSmallFast32(g.nextInt()));
// ... add more here.
// "long"-based RNGs.
@@ -129,7 +129,7 @@ public final class ProvidersList {
add(LIST64, new XoShiRo512StarStar(new long[] {g.nextLong(), g.nextLong(), g.nextLong(), g.nextLong()}));
add(LIST64, new PcgRxsMXs64(new long[] {g.nextLong()}));
add(LIST64, new DotyHumphreySmallFastCounting64(new long[] {g.nextLong(), g.nextLong()}));
- add(LIST64, new JSF64(g.nextLong()));
+ add(LIST64, new JenkinsSmallFast64(g.nextLong()));
// ... add more here.
// Do not modify the remaining statements.
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/JSF32Test.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/JenkinsSmallFast32Test.java
similarity index 93%
rename from commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/JSF32Test.java
rename to commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/JenkinsSmallFast32Test.java
index 5e65627..87fccc6 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/JSF32Test.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/JenkinsSmallFast32Test.java
@@ -20,7 +20,7 @@ package org.apache.commons.rng.core.source32;
import org.apache.commons.rng.core.RandomAssert;
import org.junit.Test;
-public class JSF32Test {
+public class JenkinsSmallFast32Test {
@Test
public void testReferenceCode() {
/*
@@ -39,6 +39,6 @@ public class JSF32Test {
0x522a44c5, 0x25f4baf8, 0x9fd1d806, 0x3a24f3bc,
0x78f2aac1, 0xce496e14, 0x74d186b8, 0x34ff8809,
};
- RandomAssert.assertEquals(expectedSequence, new JSF32(0xb5ad4ece));
+ RandomAssert.assertEquals(expectedSequence, new JenkinsSmallFast32(0xb5ad4ece));
}
}
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/JSF64Test.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/JenkinsSmallFast64Test.java
similarity index 94%
rename from commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/JSF64Test.java
rename to commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/JenkinsSmallFast64Test.java
index a74dde1..3b5d951 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/JSF64Test.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/JenkinsSmallFast64Test.java
@@ -20,7 +20,7 @@ package org.apache.commons.rng.core.source64;
import org.apache.commons.rng.core.RandomAssert;
import org.junit.Test;
-public class JSF64Test {
+public class JenkinsSmallFast64Test {
@Test
public void testReferenceCode() {
/*
@@ -39,6 +39,6 @@ public class JSF64Test {
0x79ad91f7404ecef1L, 0x291858706a2286dbL, 0xf395681f493eb602L, 0xf85ed536da160b93L,
0x5dd685454dd0d913L, 0x150e7b8f99b10f7dL, 0xcd1c0b519cc69c05L, 0xca92e08bf2676077L,
};
- RandomAssert.assertEquals(expectedSequence, new JSF64(0x012de1babb3c4104L));
+ RandomAssert.assertEquals(expectedSequence, new JenkinsSmallFast64(0x012de1babb3c4104L));
}
}
diff --git a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java
index 16bc244..df51639 100644
--- a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java
+++ b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java
@@ -452,7 +452,7 @@ public enum RandomSource {
*/
SFC_64(ProviderBuilder.RandomSourceInternal.SFC_64),
/**
- * Source of randomness is {@link org.apache.commons.rng.core.source32.JSF32}.
+ * Source of randomness is {@link org.apache.commons.rng.core.source32.JenkinsSmallFast32}.
* <ul>
* <li>Native seed type: {@code Integer}.</li>
* <li>Native seed size: 1.</li>
@@ -460,7 +460,7 @@ public enum RandomSource {
*/
JSF_32(ProviderBuilder.RandomSourceInternal.JSF_32),
/**
- * Source of randomness is {@link org.apache.commons.rng.core.source64.JSF64}.
+ * Source of randomness is {@link org.apache.commons.rng.core.source64.JenkinsSmallFast64}.
* <ul>
* <li>Native seed type: {@code Long}.</li>
* <li>Native seed size: 1.</li>
diff --git a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
index af20e6b..59b9271 100644
--- a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
+++ b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
@@ -43,7 +43,7 @@ import org.apache.commons.rng.core.source32.PcgXshRs32;
import org.apache.commons.rng.core.source32.PcgMcgXshRr32;
import org.apache.commons.rng.core.source32.PcgMcgXshRs32;
import org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32;
-import org.apache.commons.rng.core.source32.JSF32;
+import org.apache.commons.rng.core.source32.JenkinsSmallFast32;
import org.apache.commons.rng.core.source64.SplitMix64;
import org.apache.commons.rng.core.source64.XorShift1024Star;
import org.apache.commons.rng.core.source64.XorShift1024StarPhi;
@@ -57,7 +57,7 @@ import org.apache.commons.rng.core.source64.XoShiRo512Plus;
import org.apache.commons.rng.core.source64.XoShiRo512StarStar;
import org.apache.commons.rng.core.source64.PcgRxsMXs64;
import org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64;
-import org.apache.commons.rng.core.source64.JSF64;
+import org.apache.commons.rng.core.source64.JenkinsSmallFast64;
/**
* RNG builder.
@@ -297,12 +297,12 @@ public final class ProviderBuilder {
SFC_64(DotyHumphreySmallFastCounting64.class,
3,
NativeSeedType.LONG_ARRAY),
- /** Source of randomness is {@link JSF32}. */
- JSF_32(JSF32.class,
+ /** Source of randomness is {@link JenkinsSmallFast32}. */
+ JSF_32(JenkinsSmallFast32.class,
1,
NativeSeedType.INT),
- /** Source of randomness is {@link JSF64}. */
- JSF_64(JSF64.class,
+ /** Source of randomness is {@link JenkinsSmallFast64}. */
+ JSF_64(JenkinsSmallFast64.class,
1,
NativeSeedType.LONG);
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a1a7469..132a3fe 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -76,7 +76,7 @@ within the allotted number of reruns (the test will be marked
as 'flaky' in the report).
">
<action dev="aherbert" type="add" issue="RNG-111">
- New "JSF32" and "JSF64" (Jenkins' Small Fast) generators.
+ New "JenkinsSmallFast32" and "JenkinsSmallFast64" generators.
</action>
<action dev="aherbert" type="update" issue="RNG-114">
"ListSampler": Select the shuffle algorithm based on the list type. This improves
diff --git a/src/site/resources/txt/userguide/stress/dh_36_1 b/src/site/resources/txt/userguide/stress/dh_36_1
index fa3fcdb..84e2191 100644
--- a/src/site/resources/txt/userguide/stress/dh_36_1
+++ b/src/site/resources/txt/userguide/stress/dh_36_1
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_36_2 b/src/site/resources/txt/userguide/stress/dh_36_2
index 00325a0..92408bb 100644
--- a/src/site/resources/txt/userguide/stress/dh_36_2
+++ b/src/site/resources/txt/userguide/stress/dh_36_2
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_36_3 b/src/site/resources/txt/userguide/stress/dh_36_3
index 7422f4f..4be1080 100644
--- a/src/site/resources/txt/userguide/stress/dh_36_3
+++ b/src/site/resources/txt/userguide/stress/dh_36_3
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_36_4 b/src/site/resources/txt/userguide/stress/dh_36_4
index 7112ccc..e4733ab 100644
--- a/src/site/resources/txt/userguide/stress/dh_36_4
+++ b/src/site/resources/txt/userguide/stress/dh_36_4
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_36_5 b/src/site/resources/txt/userguide/stress/dh_36_5
index c6636c5..86ff659 100644
--- a/src/site/resources/txt/userguide/stress/dh_36_5
+++ b/src/site/resources/txt/userguide/stress/dh_36_5
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_37_1 b/src/site/resources/txt/userguide/stress/dh_37_1
index c469ba3..334b541 100644
--- a/src/site/resources/txt/userguide/stress/dh_37_1
+++ b/src/site/resources/txt/userguide/stress/dh_37_1
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_37_2 b/src/site/resources/txt/userguide/stress/dh_37_2
index ec09156..f29401d 100644
--- a/src/site/resources/txt/userguide/stress/dh_37_2
+++ b/src/site/resources/txt/userguide/stress/dh_37_2
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_37_3 b/src/site/resources/txt/userguide/stress/dh_37_3
index 4ea76ad..f6e0c6b 100644
--- a/src/site/resources/txt/userguide/stress/dh_37_3
+++ b/src/site/resources/txt/userguide/stress/dh_37_3
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_37_4 b/src/site/resources/txt/userguide/stress/dh_37_4
index 2ba6fc1..75e42de 100644
--- a/src/site/resources/txt/userguide/stress/dh_37_4
+++ b/src/site/resources/txt/userguide/stress/dh_37_4
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_37_5 b/src/site/resources/txt/userguide/stress/dh_37_5
index 2552e7a..d35d5da 100644
--- a/src/site/resources/txt/userguide/stress/dh_37_5
+++ b/src/site/resources/txt/userguide/stress/dh_37_5
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_36_1 b/src/site/resources/txt/userguide/stress/tu_36_1
index 6c1c957..adeb177 100644
--- a/src/site/resources/txt/userguide/stress/tu_36_1
+++ b/src/site/resources/txt/userguide/stress/tu_36_1
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_36_2 b/src/site/resources/txt/userguide/stress/tu_36_2
index f0b93af..1e5b3ed 100644
--- a/src/site/resources/txt/userguide/stress/tu_36_2
+++ b/src/site/resources/txt/userguide/stress/tu_36_2
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_36_3 b/src/site/resources/txt/userguide/stress/tu_36_3
index 2d2ff73..dd3064f 100644
--- a/src/site/resources/txt/userguide/stress/tu_36_3
+++ b/src/site/resources/txt/userguide/stress/tu_36_3
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_36_4 b/src/site/resources/txt/userguide/stress/tu_36_4
index ac54851..9301961 100644
--- a/src/site/resources/txt/userguide/stress/tu_36_4
+++ b/src/site/resources/txt/userguide/stress/tu_36_4
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_36_5 b/src/site/resources/txt/userguide/stress/tu_36_5
index ecb7443..2e55ab0 100644
--- a/src/site/resources/txt/userguide/stress/tu_36_5
+++ b/src/site/resources/txt/userguide/stress/tu_36_5
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.JSF32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.JenkinsSmallFast32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_37_1 b/src/site/resources/txt/userguide/stress/tu_37_1
index dfafc6b..3c67730 100644
--- a/src/site/resources/txt/userguide/stress/tu_37_1
+++ b/src/site/resources/txt/userguide/stress/tu_37_1
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_37_2 b/src/site/resources/txt/userguide/stress/tu_37_2
index 135b0ae..4319218 100644
--- a/src/site/resources/txt/userguide/stress/tu_37_2
+++ b/src/site/resources/txt/userguide/stress/tu_37_2
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_37_3 b/src/site/resources/txt/userguide/stress/tu_37_3
index 4a33d59..508dfcc 100644
--- a/src/site/resources/txt/userguide/stress/tu_37_3
+++ b/src/site/resources/txt/userguide/stress/tu_37_3
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_37_4 b/src/site/resources/txt/userguide/stress/tu_37_4
index e68f983..681dcb3 100644
--- a/src/site/resources/txt/userguide/stress/tu_37_4
+++ b/src/site/resources/txt/userguide/stress/tu_37_4
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_37_5 b/src/site/resources/txt/userguide/stress/tu_37_5
index 74736d5..8e1bce3 100644
--- a/src/site/resources/txt/userguide/stress/tu_37_5
+++ b/src/site/resources/txt/userguide/stress/tu_37_5
@@ -1,6 +1,6 @@
#
# RandomSource: JSF_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.JSF64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.JenkinsSmallFast64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
[commons-rng] 01/02: Renamed SFC generators to
DotyHumphreySmallFastCounting.
Posted by ah...@apache.org.
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 27a2f765fd6169efd2e2f94a1baf3277d1d093cc
Author: aherbert <ah...@apache.org>
AuthorDate: Tue Sep 17 16:52:17 2019 +0100
Renamed SFC generators to DotyHumphreySmallFastCounting.
---
.../{SFC32.java => DotyHumphreySmallFastCounting32.java} | 6 +++---
.../{SFC64.java => DotyHumphreySmallFastCounting64.java} | 6 +++---
.../test/java/org/apache/commons/rng/core/ProvidersList.java | 8 ++++----
...C32Test.java => DotyHumphreySmallFastCounting32Test.java} | 4 ++--
...C64Test.java => DotyHumphreySmallFastCounting64Test.java} | 4 ++--
.../java/org/apache/commons/rng/simple/RandomSource.java | 4 ++--
.../apache/commons/rng/simple/internal/ProviderBuilder.java | 12 ++++++------
src/changes/changes.xml | 2 +-
src/site/resources/txt/userguide/stress/dh_34_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_34_5 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_1 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_2 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_3 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_4 | 2 +-
src/site/resources/txt/userguide/stress/dh_35_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_34_5 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_1 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_2 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_3 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_4 | 2 +-
src/site/resources/txt/userguide/stress/tu_35_5 | 2 +-
28 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/SFC32.java b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/DotyHumphreySmallFastCounting32.java
similarity index 93%
rename from commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/SFC32.java
rename to commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/DotyHumphreySmallFastCounting32.java
index 384086d..6f97bf5 100644
--- a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/SFC32.java
+++ b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source32/DotyHumphreySmallFastCounting32.java
@@ -19,7 +19,7 @@ package org.apache.commons.rng.core.source32;
import org.apache.commons.rng.core.util.NumberFactory;
/**
- * Implement the Small, Fast, Chaotic (SFC) 32-bit generator of Chris Doty-Humphrey.
+ * Implement the Small, Fast, Counting (SFC) 32-bit generator of Chris Doty-Humphrey.
* The original source is the PractRand test suite by the same author.
*
* <p>The state size is 128-bits; the period is a minimum of 2<sup>32</sup> and an
@@ -29,7 +29,7 @@ import org.apache.commons.rng.core.util.NumberFactory;
*
* @since 1.3
*/
-public class SFC32 extends IntProvider {
+public class DotyHumphreySmallFastCounting32 extends IntProvider {
/** Size of the seed. */
private static final int SEED_SIZE = 3;
@@ -49,7 +49,7 @@ public class SFC32 extends IntProvider {
* If the length is larger than 3, only the first 3 elements will
* be used; if smaller, the remaining elements will be automatically set.
*/
- public SFC32(int[] seed) {
+ public DotyHumphreySmallFastCounting32(int[] seed) {
if (seed.length < SEED_SIZE) {
final int[] state = new int[SEED_SIZE];
fillState(state, seed);
diff --git a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/SFC64.java b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/DotyHumphreySmallFastCounting64.java
similarity index 93%
rename from commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/SFC64.java
rename to commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/DotyHumphreySmallFastCounting64.java
index 8876c58..5517f83 100644
--- a/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/SFC64.java
+++ b/commons-rng-core/src/main/java/org/apache/commons/rng/core/source64/DotyHumphreySmallFastCounting64.java
@@ -19,7 +19,7 @@ package org.apache.commons.rng.core.source64;
import org.apache.commons.rng.core.util.NumberFactory;
/**
- * Implement the Small, Fast, Chaotic (SFC) 64-bit generator of Chris Doty-Humphrey.
+ * Implement the Small, Fast, Counting (SFC) 64-bit generator of Chris Doty-Humphrey.
* The original source is the PractRand test suite by the same author.
*
* <p>The state size is 256-bits; the period is a minimum of 2<sup>64</sup> and an
@@ -29,7 +29,7 @@ import org.apache.commons.rng.core.util.NumberFactory;
*
* @since 1.3
*/
-public class SFC64 extends LongProvider {
+public class DotyHumphreySmallFastCounting64 extends LongProvider {
/** Size of the seed. */
private static final int SEED_SIZE = 3;
@@ -49,7 +49,7 @@ public class SFC64 extends LongProvider {
* If the length is larger than 3, only the first 3 elements will
* be used; if smaller, the remaining elements will be automatically set.
*/
- public SFC64(long[] seed) {
+ public DotyHumphreySmallFastCounting64(long[] seed) {
if (seed.length < SEED_SIZE) {
final long[] state = new long[SEED_SIZE];
fillState(state, seed);
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
index c61a13f..242a0ac 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/ProvidersList.java
@@ -40,7 +40,7 @@ import org.apache.commons.rng.core.source32.MultiplyWithCarry256;
import org.apache.commons.rng.core.source32.KISSRandom;
import org.apache.commons.rng.core.source32.PcgXshRr32;
import org.apache.commons.rng.core.source32.PcgXshRs32;
-import org.apache.commons.rng.core.source32.SFC32;
+import org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32;
import org.apache.commons.rng.core.source32.PcgMcgXshRr32;
import org.apache.commons.rng.core.source32.PcgMcgXshRs32;
import org.apache.commons.rng.core.source64.SplitMix64;
@@ -56,7 +56,7 @@ import org.apache.commons.rng.core.source64.XoShiRo512StarStar;
import org.apache.commons.rng.core.source64.JSF64;
import org.apache.commons.rng.core.source64.MersenneTwister64;
import org.apache.commons.rng.core.source64.PcgRxsMXs64;
-import org.apache.commons.rng.core.source64.SFC64;
+import org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64;
import org.apache.commons.rng.JumpableUniformRandomProvider;
import org.apache.commons.rng.RestorableUniformRandomProvider;
@@ -110,7 +110,7 @@ public final class ProvidersList {
add(LIST32, new PcgMcgXshRs32(g.nextLong()));
// Ensure a high complexity increment is used for the Weyl sequence
add(LIST32, new MiddleSquareWeylSequence(new long[] {g.nextLong(), g.nextLong(), 0xb5ad4eceda1ce2a9L}));
- add(LIST32, new SFC32(new int[] {g.nextInt(), g.nextInt()}));
+ add(LIST32, new DotyHumphreySmallFastCounting32(new int[] {g.nextInt(), g.nextInt()}));
add(LIST32, new JSF32(g.nextInt()));
// ... add more here.
@@ -128,7 +128,7 @@ public final class ProvidersList {
add(LIST64, new XoShiRo512Plus(new long[] {g.nextLong(), g.nextLong(), g.nextLong(), g.nextLong()}));
add(LIST64, new XoShiRo512StarStar(new long[] {g.nextLong(), g.nextLong(), g.nextLong(), g.nextLong()}));
add(LIST64, new PcgRxsMXs64(new long[] {g.nextLong()}));
- add(LIST64, new SFC64(new long[] {g.nextLong(), g.nextLong()}));
+ add(LIST64, new DotyHumphreySmallFastCounting64(new long[] {g.nextLong(), g.nextLong()}));
add(LIST64, new JSF64(g.nextLong()));
// ... add more here.
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/SFC32Test.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/DotyHumphreySmallFastCounting32Test.java
similarity index 92%
rename from commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/SFC32Test.java
rename to commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/DotyHumphreySmallFastCounting32Test.java
index 70c9552..ca61e2c 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/SFC32Test.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source32/DotyHumphreySmallFastCounting32Test.java
@@ -20,7 +20,7 @@ package org.apache.commons.rng.core.source32;
import org.apache.commons.rng.core.RandomAssert;
import org.junit.Test;
-public class SFC32Test {
+public class DotyHumphreySmallFastCounting32Test {
@Test
public void testReferenceCode() {
/*
@@ -39,7 +39,7 @@ public class SFC32Test {
0x19400604, 0xb76e7394, 0x037addd5, 0xe916ed79,
0x94f10dc6, 0xf2ecb45e, 0x69834355, 0xb814aeb2,
};
- RandomAssert.assertEquals(expectedSequence, new SFC32(new int[] {
+ RandomAssert.assertEquals(expectedSequence, new DotyHumphreySmallFastCounting32(new int[] {
0xbb3c4104, 0x02294965, 0xda1ce2a9
}));
}
diff --git a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/SFC64Test.java b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/DotyHumphreySmallFastCounting64Test.java
similarity index 93%
rename from commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/SFC64Test.java
rename to commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/DotyHumphreySmallFastCounting64Test.java
index b2ed395..154532f 100644
--- a/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/SFC64Test.java
+++ b/commons-rng-core/src/test/java/org/apache/commons/rng/core/source64/DotyHumphreySmallFastCounting64Test.java
@@ -20,7 +20,7 @@ package org.apache.commons.rng.core.source64;
import org.apache.commons.rng.core.RandomAssert;
import org.junit.Test;
-public class SFC64Test {
+public class DotyHumphreySmallFastCounting64Test {
@Test
public void testReferenceCode() {
/*
@@ -39,7 +39,7 @@ public class SFC64Test {
0x6b44e298f16ca140L, 0xf1c7b84c51d8b1d8L, 0x0bee55dd0ea4439dL, 0xd9a26515c0a88471L,
0xda4c3174cafc57f8L, 0x6193f4b96362eb4bL, 0x207e9a94b58041afL, 0x5451bd65c481d8fcL,
};
- RandomAssert.assertEquals(expectedSequence, new SFC64(new long[] {
+ RandomAssert.assertEquals(expectedSequence, new DotyHumphreySmallFastCounting64(new long[] {
0x012de1babb3c4104L, 0xc8161b4202294965L, 0xb5ad4eceda1ce2a9L
}));
}
diff --git a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java
index a70110d..16bc244 100644
--- a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java
+++ b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/RandomSource.java
@@ -436,7 +436,7 @@ public enum RandomSource {
*/
MSWS(ProviderBuilder.RandomSourceInternal.MSWS),
/**
- * Source of randomness is {@link org.apache.commons.rng.core.source32.SFC32}.
+ * Source of randomness is {@link org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32}.
* <ul>
* <li>Native seed type: {@code int[]}.</li>
* <li>Native seed size: 3.</li>
@@ -444,7 +444,7 @@ public enum RandomSource {
*/
SFC_32(ProviderBuilder.RandomSourceInternal.SFC_32),
/**
- * Source of randomness is {@link org.apache.commons.rng.core.source64.SFC64}.
+ * Source of randomness is {@link org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64}.
* <ul>
* <li>Native seed type: {@code long[]}.</li>
* <li>Native seed size: 3.</li>
diff --git a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
index 3ad50fe..af20e6b 100644
--- a/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
+++ b/commons-rng-simple/src/main/java/org/apache/commons/rng/simple/internal/ProviderBuilder.java
@@ -42,7 +42,7 @@ import org.apache.commons.rng.core.source32.PcgXshRr32;
import org.apache.commons.rng.core.source32.PcgXshRs32;
import org.apache.commons.rng.core.source32.PcgMcgXshRr32;
import org.apache.commons.rng.core.source32.PcgMcgXshRs32;
-import org.apache.commons.rng.core.source32.SFC32;
+import org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32;
import org.apache.commons.rng.core.source32.JSF32;
import org.apache.commons.rng.core.source64.SplitMix64;
import org.apache.commons.rng.core.source64.XorShift1024Star;
@@ -56,7 +56,7 @@ import org.apache.commons.rng.core.source64.XoShiRo256StarStar;
import org.apache.commons.rng.core.source64.XoShiRo512Plus;
import org.apache.commons.rng.core.source64.XoShiRo512StarStar;
import org.apache.commons.rng.core.source64.PcgRxsMXs64;
-import org.apache.commons.rng.core.source64.SFC64;
+import org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64;
import org.apache.commons.rng.core.source64.JSF64;
/**
@@ -289,12 +289,12 @@ public final class ProviderBuilder {
return new long[] {state, weylState, increment};
}
},
- /** Source of randomness is {@link SFC32}. */
- SFC_32(SFC32.class,
+ /** Source of randomness is {@link DotyHumphreySmallFastCounting32}. */
+ SFC_32(DotyHumphreySmallFastCounting32.class,
3,
NativeSeedType.INT_ARRAY),
- /** Source of randomness is {@link SFC64}. */
- SFC_64(SFC64.class,
+ /** Source of randomness is {@link DotyHumphreySmallFastCounting64}. */
+ SFC_64(DotyHumphreySmallFastCounting64.class,
3,
NativeSeedType.LONG_ARRAY),
/** Source of randomness is {@link JSF32}. */
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3b7fc9d..a1a7469 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -93,7 +93,7 @@ as 'flaky' in the report).
previously been used to save state.
</action>
<action dev="aherbert" type="add" issue="RNG-112">
- New "SFC32" and "SFC64" (Small, Fast, Chaotic) generators.
+ New "DotyHumphreySmallFastCounting32" and "DotyHumphreySmallFastCounting64" generators.
</action>
<action dev="aherbert" type="update" issue="RNG-109">
"DiscreteProbabilityCollectionSampler": Use a faster enumerated probability
diff --git a/src/site/resources/txt/userguide/stress/dh_34_1 b/src/site/resources/txt/userguide/stress/dh_34_1
index 12bf27b..b7125ce 100644
--- a/src/site/resources/txt/userguide/stress/dh_34_1
+++ b/src/site/resources/txt/userguide/stress/dh_34_1
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_34_2 b/src/site/resources/txt/userguide/stress/dh_34_2
index cbb9fc0..935de45 100644
--- a/src/site/resources/txt/userguide/stress/dh_34_2
+++ b/src/site/resources/txt/userguide/stress/dh_34_2
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_34_3 b/src/site/resources/txt/userguide/stress/dh_34_3
index 52430c9..e1ad9f1 100644
--- a/src/site/resources/txt/userguide/stress/dh_34_3
+++ b/src/site/resources/txt/userguide/stress/dh_34_3
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_34_4 b/src/site/resources/txt/userguide/stress/dh_34_4
index 3fa0c06..d4778f2 100644
--- a/src/site/resources/txt/userguide/stress/dh_34_4
+++ b/src/site/resources/txt/userguide/stress/dh_34_4
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_34_5 b/src/site/resources/txt/userguide/stress/dh_34_5
index 302de7a..0ef8979 100644
--- a/src/site/resources/txt/userguide/stress/dh_34_5
+++ b/src/site/resources/txt/userguide/stress/dh_34_5
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_35_1 b/src/site/resources/txt/userguide/stress/dh_35_1
index 96faf1b..89704c0 100644
--- a/src/site/resources/txt/userguide/stress/dh_35_1
+++ b/src/site/resources/txt/userguide/stress/dh_35_1
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_35_2 b/src/site/resources/txt/userguide/stress/dh_35_2
index 171ff54..75399b1 100644
--- a/src/site/resources/txt/userguide/stress/dh_35_2
+++ b/src/site/resources/txt/userguide/stress/dh_35_2
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_35_3 b/src/site/resources/txt/userguide/stress/dh_35_3
index 4069daf..2e5c2b6 100644
--- a/src/site/resources/txt/userguide/stress/dh_35_3
+++ b/src/site/resources/txt/userguide/stress/dh_35_3
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_35_4 b/src/site/resources/txt/userguide/stress/dh_35_4
index 1a5c75e..7307dfc 100644
--- a/src/site/resources/txt/userguide/stress/dh_35_4
+++ b/src/site/resources/txt/userguide/stress/dh_35_4
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/dh_35_5 b/src/site/resources/txt/userguide/stress/dh_35_5
index 979fe84..04528c6 100644
--- a/src/site/resources/txt/userguide/stress/dh_35_5
+++ b/src/site/resources/txt/userguide/stress/dh_35_5
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_34_1 b/src/site/resources/txt/userguide/stress/tu_34_1
index 8ff825a..9ae0feb 100644
--- a/src/site/resources/txt/userguide/stress/tu_34_1
+++ b/src/site/resources/txt/userguide/stress/tu_34_1
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_34_2 b/src/site/resources/txt/userguide/stress/tu_34_2
index 311029f..f4aa20b 100644
--- a/src/site/resources/txt/userguide/stress/tu_34_2
+++ b/src/site/resources/txt/userguide/stress/tu_34_2
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_34_3 b/src/site/resources/txt/userguide/stress/tu_34_3
index 1a13487..8f6963a 100644
--- a/src/site/resources/txt/userguide/stress/tu_34_3
+++ b/src/site/resources/txt/userguide/stress/tu_34_3
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_34_4 b/src/site/resources/txt/userguide/stress/tu_34_4
index 7b93c17..d4d3e0e 100644
--- a/src/site/resources/txt/userguide/stress/tu_34_4
+++ b/src/site/resources/txt/userguide/stress/tu_34_4
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_34_5 b/src/site/resources/txt/userguide/stress/tu_34_5
index 9e2f4ef..356d2c2 100644
--- a/src/site/resources/txt/userguide/stress/tu_34_5
+++ b/src/site/resources/txt/userguide/stress/tu_34_5
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_32
-# RNG: Byte-reversed org.apache.commons.rng.core.source32.SFC32
+# RNG: Byte-reversed org.apache.commons.rng.core.source32.DotyHumphreySmallFastCounting32
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_35_1 b/src/site/resources/txt/userguide/stress/tu_35_1
index d7a2dc9..1069d90 100644
--- a/src/site/resources/txt/userguide/stress/tu_35_1
+++ b/src/site/resources/txt/userguide/stress/tu_35_1
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_35_2 b/src/site/resources/txt/userguide/stress/tu_35_2
index a71f6d0..855540c 100644
--- a/src/site/resources/txt/userguide/stress/tu_35_2
+++ b/src/site/resources/txt/userguide/stress/tu_35_2
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_35_3 b/src/site/resources/txt/userguide/stress/tu_35_3
index 46ce994..2ea5ab0 100644
--- a/src/site/resources/txt/userguide/stress/tu_35_3
+++ b/src/site/resources/txt/userguide/stress/tu_35_3
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_35_4 b/src/site/resources/txt/userguide/stress/tu_35_4
index 3517442..4524eb0 100644
--- a/src/site/resources/txt/userguide/stress/tu_35_4
+++ b/src/site/resources/txt/userguide/stress/tu_35_4
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)
diff --git a/src/site/resources/txt/userguide/stress/tu_35_5 b/src/site/resources/txt/userguide/stress/tu_35_5
index afb9075..d9fe2f5 100644
--- a/src/site/resources/txt/userguide/stress/tu_35_5
+++ b/src/site/resources/txt/userguide/stress/tu_35_5
@@ -1,6 +1,6 @@
#
# RandomSource: SFC_64
-# RNG: Byte-reversed org.apache.commons.rng.core.source64.SFC64
+# RNG: Byte-reversed org.apache.commons.rng.core.source64.DotyHumphreySmallFastCounting64
#
# Java: 1.8.0_202
# Runtime: Java(TM) SE Runtime Environment (build 1.8.0_202-b08)