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/10/01 11:18:33 UTC
[commons-rng] 03/03: Refactored the JMH examples to packages for
each component.
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 667816670861335f0243d2bdf11d5b9d3c4290a5
Author: aherbert <ah...@apache.org>
AuthorDate: Tue Oct 1 12:18:07 2019 +0100
Refactored the JMH examples to packages for each component.
---
.../commons/rng/examples/jmh/{ => core}/AbstractBenchmark.java | 2 +-
.../examples/jmh/{ => core}/BaselineGenerationPerformance.java | 2 +-
.../commons/rng/examples/jmh/{ => core}/BaselineSources.java | 2 +-
.../apache/commons/rng/examples/jmh/{ => core}/BaselineUtils.java | 2 +-
.../jmh/{ => core}/FloatingPointGenerationPerformance.java | 2 +-
.../examples/jmh/{ => core}/NextBooleanGenerationPerformance.java | 2 +-
.../examples/jmh/{ => core}/NextBytesGenerationPerformance.java | 2 +-
.../examples/jmh/{ => core}/NextDoubleGenerationPerformance.java | 2 +-
.../examples/jmh/{ => core}/NextFloatGenerationPerformance.java | 2 +-
.../rng/examples/jmh/{ => core}/NextIntGenerationPerformance.java | 2 +-
.../examples/jmh/{ => core}/NextLongGenerationPerformance.java | 2 +-
.../rng/examples/jmh/{ => core}/RngNextIntInRangeBenchmark.java | 2 +-
.../rng/examples/jmh/{distribution => core}/package-info.java | 4 ++--
.../java/org/apache/commons/rng/examples/jmh/package-info.java | 4 ++--
.../distribution/AliasMethodDiscreteSamplerPerformance.java | 2 +-
.../distribution/ContinuousSamplersPerformance.java | 2 +-
.../{ => sampling}/distribution/DiscreteSamplersPerformance.java | 2 +-
.../distribution/DiscreteUniformSamplerGenerationPerformance.java | 2 +-
.../distribution/EnumeratedDistributionSamplersPerformance.java | 2 +-
.../{ => sampling}/distribution/GeometricSamplersPerformance.java | 2 +-
.../jmh/{ => sampling}/distribution/NextGaussianPerformance.java | 2 +-
.../distribution/PoissonSamplerCachePerformance.java | 2 +-
.../{ => sampling}/distribution/PoissonSamplersPerformance.java | 2 +-
.../examples/jmh/{ => sampling}/distribution/package-info.java | 4 ++--
.../apache/commons/rng/examples/jmh/sampling/package-info.java | 2 +-
.../rng/examples/jmh/{ => simple}/ConstructionPerformance.java | 8 ++++++--
.../examples/jmh/{ => simple}/SeedArrayGenerationPerformance.java | 2 +-
.../rng/examples/jmh/{ => simple}/SeedGenerationPerformance.java | 2 +-
.../rng/examples/jmh/{ => simple}/ThreadLocalPerformance.java | 2 +-
.../rng/examples/jmh/{distribution => simple}/package-info.java | 4 ++--
30 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/AbstractBenchmark.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/AbstractBenchmark.java
similarity index 97%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/AbstractBenchmark.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/AbstractBenchmark.java
index eb0d166..baa1dbe 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/AbstractBenchmark.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/AbstractBenchmark.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineGenerationPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineGenerationPerformance.java
index 87f71fc..4a82d0f 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.openjdk.jmh.annotations.Benchmark;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineSources.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineSources.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineSources.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineSources.java
index 0c754fc..bff6366 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineSources.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineSources.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.simple.RandomSource;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineUtils.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineUtils.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineUtils.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineUtils.java
index 26ddc52..95914ec 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/BaselineUtils.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/BaselineUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/FloatingPointGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/FloatingPointGenerationPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/FloatingPointGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/FloatingPointGenerationPerformance.java
index 146ebec..1fdc067 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/FloatingPointGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/FloatingPointGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextBooleanGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextBooleanGenerationPerformance.java
similarity index 97%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextBooleanGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextBooleanGenerationPerformance.java
index dfca59e..fe454d2 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextBooleanGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextBooleanGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.openjdk.jmh.annotations.Benchmark;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextBytesGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextBytesGenerationPerformance.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextBytesGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextBytesGenerationPerformance.java
index b7d064c..af7abbd 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextBytesGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextBytesGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.openjdk.jmh.annotations.Benchmark;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextDoubleGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextDoubleGenerationPerformance.java
similarity index 97%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextDoubleGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextDoubleGenerationPerformance.java
index df256b2..a474ffc 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextDoubleGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextDoubleGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.openjdk.jmh.annotations.Benchmark;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextFloatGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextFloatGenerationPerformance.java
similarity index 97%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextFloatGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextFloatGenerationPerformance.java
index 1f1b28b..05234f0 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextFloatGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextFloatGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.openjdk.jmh.annotations.Benchmark;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextIntGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextIntGenerationPerformance.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextIntGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextIntGenerationPerformance.java
index 0e6be7d..980c23b 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextIntGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextIntGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.openjdk.jmh.annotations.Benchmark;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextLongGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextLongGenerationPerformance.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextLongGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextLongGenerationPerformance.java
index a9b09a7..6433077 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/NextLongGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/NextLongGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.openjdk.jmh.annotations.Benchmark;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/RngNextIntInRangeBenchmark.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/RngNextIntInRangeBenchmark.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/RngNextIntInRangeBenchmark.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/RngNextIntInRangeBenchmark.java
index 921c003..1d12570 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/RngNextIntInRangeBenchmark.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/RngNextIntInRangeBenchmark.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.core;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.core.source32.IntProvider;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/package-info.java
similarity index 87%
copy from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java
copy to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/package-info.java
index 517063d..2836127 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/core/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Benchmarks for samplers.
+ * Benchmarks for the {@code org.apache.commons.rng.core} components.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.core;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/package-info.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/package-info.java
index b8f1645..1985385 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/package-info.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/package-info.java
@@ -31,8 +31,8 @@
*
* <ul>
* <li>The {@link org.apache.commons.rng.examples.jmh.RandomSourceValues RandomSourceValues} class
- * <li>The {@link org.apache.commons.rng.examples.jmh.BaselineSources BaselineSources} class
- * <li>The {@link org.apache.commons.rng.examples.jmh.ConstructionPerformance
+ * <li>The {@link org.apache.commons.rng.examples.jmh.core.BaselineSources BaselineSources} class
+ * <li>The {@link org.apache.commons.rng.examples.jmh.simple.ConstructionPerformance
* ConstructionPerformance} class
* </ul>
*/
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/AliasMethodDiscreteSamplerPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/AliasMethodDiscreteSamplerPerformance.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/AliasMethodDiscreteSamplerPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/AliasMethodDiscreteSamplerPerformance.java
index 8d83a6f..f08918c 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/AliasMethodDiscreteSamplerPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/AliasMethodDiscreteSamplerPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.sampling.distribution.AliasMethodDiscreteSampler;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/ContinuousSamplersPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/ContinuousSamplersPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/ContinuousSamplersPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/ContinuousSamplersPerformance.java
index d7ce277..ece69a2 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/ContinuousSamplersPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/ContinuousSamplersPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.examples.jmh.RandomSources;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/DiscreteSamplersPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/DiscreteSamplersPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/DiscreteSamplersPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/DiscreteSamplersPerformance.java
index 257721f..47afa4a 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/DiscreteSamplersPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/DiscreteSamplersPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.examples.jmh.RandomSources;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/DiscreteUniformSamplerGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/DiscreteUniformSamplerGenerationPerformance.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/DiscreteUniformSamplerGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/DiscreteUniformSamplerGenerationPerformance.java
index ce1a7d0..2925c4f 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/DiscreteUniformSamplerGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/DiscreteUniformSamplerGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.apache.commons.rng.RestorableUniformRandomProvider;
import org.apache.commons.rng.UniformRandomProvider;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/EnumeratedDistributionSamplersPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/EnumeratedDistributionSamplersPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/EnumeratedDistributionSamplersPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/EnumeratedDistributionSamplersPerformance.java
index 19ef181..41bce62 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/EnumeratedDistributionSamplersPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/EnumeratedDistributionSamplersPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.apache.commons.math3.distribution.BinomialDistribution;
import org.apache.commons.math3.distribution.IntegerDistribution;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/GeometricSamplersPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/GeometricSamplersPerformance.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/GeometricSamplersPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/GeometricSamplersPerformance.java
index 8f6ad72..9fe01d0 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/GeometricSamplersPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/GeometricSamplersPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.sampling.distribution.DiscreteInverseCumulativeProbabilityFunction;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/NextGaussianPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/NextGaussianPerformance.java
similarity index 97%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/NextGaussianPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/NextGaussianPerformance.java
index 0b89a47..a4705c0 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/NextGaussianPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/NextGaussianPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/PoissonSamplerCachePerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/PoissonSamplerCachePerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/PoissonSamplerCachePerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/PoissonSamplerCachePerformance.java
index ed947ec..80e4381 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/PoissonSamplerCachePerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/PoissonSamplerCachePerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import java.util.concurrent.TimeUnit;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/PoissonSamplersPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/PoissonSamplersPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/PoissonSamplersPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/PoissonSamplersPerformance.java
index 738c5e0..278b63d 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/PoissonSamplersPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/PoissonSamplersPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.sampling.distribution.DiscreteSampler;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/package-info.java
similarity index 84%
copy from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java
copy to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/package-info.java
index 517063d..a6f63f6 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/distribution/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Benchmarks for samplers.
+ * Benchmarks for the {@code org.apache.commons.rng.sampling.distribution} components.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.sampling.distribution;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/package-info.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/package-info.java
index dc1958f..cd52829 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/package-info.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/sampling/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Benchmarks for samplers.
+ * Benchmarks for the {@code org.apache.commons.rng.sampling} components.
*/
package org.apache.commons.rng.examples.jmh.sampling;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/ConstructionPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/ConstructionPerformance.java
similarity index 98%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/ConstructionPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/ConstructionPerformance.java
index 747c7e3..0cf8df5 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/ConstructionPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/ConstructionPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.simple;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -64,6 +64,7 @@ import org.apache.commons.rng.core.source64.XoShiRo512StarStar;
import org.apache.commons.rng.core.source64.XorShift1024Star;
import org.apache.commons.rng.core.source64.XorShift1024StarPhi;
import org.apache.commons.rng.core.util.NumberFactory;
+import org.apache.commons.rng.examples.jmh.RandomSourceValues;
import org.apache.commons.rng.simple.RandomSource;
import org.apache.commons.rng.simple.internal.ProviderBuilder.RandomSourceInternal;
import org.apache.commons.rng.simple.internal.SeedFactory;
@@ -73,7 +74,10 @@ import org.apache.commons.rng.simple.internal.SeedFactory;
*
* <p>Note that random number providers are created and then used. Thus the construction time must
* be analysed together with the run time performance benchmark (see for example
- * {@link NextIntGenerationPerformance} and {@link NextLongGenerationPerformance}).
+ * {@link org.apache.commons.rng.examples.jmh.core.NextLongGenerationPerformance
+ * NextIntGenerationPerformance} and
+ * {@link org.apache.commons.rng.examples.jmh.core.NextLongGenerationPerformance
+ * NextLongGenerationPerformance}).
*
* <pre>
* [Total time] = [Construction time] + [Run time]
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/SeedArrayGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/SeedArrayGenerationPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/SeedArrayGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/SeedArrayGenerationPerformance.java
index 8c48958..cba28f7 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/SeedArrayGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/SeedArrayGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.simple;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.simple.RandomSource;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/SeedGenerationPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/SeedGenerationPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/SeedGenerationPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/SeedGenerationPerformance.java
index 2667617..24a195e 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/SeedGenerationPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/SeedGenerationPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.simple;
import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.core.source64.SplitMix64;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/ThreadLocalPerformance.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/ThreadLocalPerformance.java
similarity index 99%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/ThreadLocalPerformance.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/ThreadLocalPerformance.java
index 11e8e43..a8d9544 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/ThreadLocalPerformance.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/ThreadLocalPerformance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.rng.examples.jmh;
+package org.apache.commons.rng.examples.jmh.simple;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
diff --git a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/package-info.java
similarity index 86%
rename from commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java
rename to commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/package-info.java
index 517063d..77044dc 100644
--- a/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/distribution/package-info.java
+++ b/commons-rng-examples/examples-jmh/src/main/java/org/apache/commons/rng/examples/jmh/simple/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Benchmarks for samplers.
+ * Benchmarks for the {@code org.apache.commons.rng.simple} components.
*/
-package org.apache.commons.rng.examples.jmh.distribution;
+package org.apache.commons.rng.examples.jmh.simple;