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 2becf4297fbbe53baaab529126809837419e009f Author: aherbert <[email protected]> AuthorDate: Fri Sep 27 14:19:10 2019 +0100 Fix PMD errors in sampling examples code. --- .../examples/sampling/ManifestVersionProvider.java | 2 +- .../ProbabilityDensityApproximationCommand.java | 9 ++++----- .../sampling/UniformSamplingVisualCheckCommand.java | 20 +++++++------------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ManifestVersionProvider.java b/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ManifestVersionProvider.java index 52ddd61..2fc683e 100644 --- a/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ManifestVersionProvider.java +++ b/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ManifestVersionProvider.java @@ -36,7 +36,7 @@ class ManifestVersionProvider implements IVersionProvider { /** {@inheritDoc} */ @Override public String[] getVersion() throws Exception { - final Enumeration<URL> resources = ManifestVersionProvider.class.getClassLoader() + final Enumeration<URL> resources = Thread.currentThread().getContextClassLoader() .getResources("META-INF/MANIFEST.MF"); while (resources.hasMoreElements()) { final URL url = resources.nextElement(); diff --git a/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ProbabilityDensityApproximationCommand.java b/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ProbabilityDensityApproximationCommand.java index 8a80405..34e2efa 100644 --- a/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ProbabilityDensityApproximationCommand.java +++ b/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/ProbabilityDensityApproximationCommand.java @@ -53,12 +53,12 @@ class ProbabilityDensityApproximationCommand implements Callable<Void> { /** Number of (equal-width) bins in the histogram. */ @Option(names = {"-b", "--bins"}, description = "The number of bins in the histogram (default: ${DEFAULT-VALUE}).") - private int numBins = 25000; + private int numBins = 25_000; /** Number of samples to be generated. */ @Option(names = {"-n", "--samples"}, description = "The number of samples in the histogram (default: ${DEFAULT-VALUE}).") - private long numSamples = 1000000000; + private long numSamples = 1_000_000_000; /** The samplers. */ @Option(names = {"-s", "--samplers"}, @@ -70,7 +70,7 @@ class ProbabilityDensityApproximationCommand implements Callable<Void> { /** Flag to output all samplers. */ @Option(names = {"-a", "--all"}, description = "Output all samplers") - private boolean allSamplers = false; + private boolean allSamplers; /** * The sampler. This enum uses lower case for clarity when matching the distribution name. @@ -123,10 +123,9 @@ class ProbabilityDensityApproximationCommand implements Callable<Void> { final double binSize = (max - min) / numBins; final long[] histogram = new long[numBins]; - long n = 0; long belowMin = 0; long aboveMax = 0; - while (++n < numSamples) { + for (long n = 0; n < numSamples; n++) { final double r = sampler.sample(); if (r < min) { diff --git a/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/UniformSamplingVisualCheckCommand.java b/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/UniformSamplingVisualCheckCommand.java index 13a170d..51e5936 100644 --- a/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/UniformSamplingVisualCheckCommand.java +++ b/commons-rng-examples/examples-sampling/src/main/java/org/apache/commons/rng/examples/sampling/UniformSamplingVisualCheckCommand.java @@ -88,22 +88,16 @@ class UniformSamplingVisualCheckCommand implements Callable<Void> { System.out.printf("# [%d] %s%n", i, samplers[i].getClass().getSimpleName()); } - int n = 0; - while (++n < numSamples) { + for (int n = 0; n < numSamples; n++) { System.out.printf("[%d]", n, rng.nextDouble()); - for (ContinuousSampler s : samplers) { - while (true) { - final double r = s.sample(); - if (r < lo || - r > hi) { - // Discard numbers outside the tiny region. - continue; - } - - System.out.printf("\t%.16e", r); - break; + for (final ContinuousSampler s : samplers) { + double r = s.sample(); + while (r < lo || r > hi) { + // Discard numbers outside the tiny region. + r = s.sample(); } + System.out.printf("\t%.16e", r); } System.out.println();
