You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2018/01/23 23:49:29 UTC
[1/3] commons-rng git commit: Use properties (POM).
Repository: commons-rng
Updated Branches:
refs/heads/master b00cdf1c3 -> 31045880c
Use properties (POM).
Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/6ee82f10
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/6ee82f10
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/6ee82f10
Branch: refs/heads/master
Commit: 6ee82f10037d8bbaebb77ad60d0c86ae6d802cd3
Parents: b00cdf1
Author: Gilles <er...@apache.org>
Authored: Tue Jan 23 16:00:26 2018 +0100
Committer: Gilles <er...@apache.org>
Committed: Tue Jan 23 16:00:26 2018 +0100
----------------------------------------------------------------------
pom.xml | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/6ee82f10/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cce440d..1c127ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
<rng.findbugs.version>3.0.2</rng.findbugs.version>
<rng.checkstyle.version>2.17</rng.checkstyle.version>
<rng.clirr.version>2.8</rng.clirr.version>
+ <rng.mathjax.version>2.7.2</rng.mathjax.version>
<!-- Workaround to avoid duplicating config files. -->
<rng.parent.dir>${basedir}</rng.parent.dir>
@@ -134,6 +135,10 @@
Temporary workaround?
-->
<commons.release.name>commons-rng-${project.version}</commons.release.name>
+ <!-- Java8+ requires additional Javadoc qualifier for MathJax (default to empty). -->
+ <allowscript.javadoc.qualifier></allowscript.javadoc.qualifier>
+ <!-- Invalid flag for old javadoc versions (default to empty). -->
+ <doclint.javadoc.qualifier></doclint.javadoc.qualifier>
</properties>
<build>
@@ -220,6 +225,17 @@
</excludes>
</configuration>
</plugin>
+
+ <plugin>
+ <!-- NOTE: javadoc config must also be set under <reporting> -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- Enable MathJax -->
+ <additionalparam>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${rng.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalparam>
+ <!-- <aggregate>true</aggregate> -->
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
@@ -343,12 +359,13 @@
</reportSet>
</reportSets>
</plugin>
- <!-- MathJax -->
<plugin>
+ <!-- NOTE: javadoc config must also be set under <build> -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <additionalparam>-Xdoclint:all --allow-script-in-comments -header <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" /></additionalparam>
+ <!-- Enable MathJax -->
+ <additionalparam>${doclint.javadoc.qualifier} ${allowscript.javadoc.qualifier} -header '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${rng.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'</additionalparam>
<!-- <aggregate>true</aggregate> -->
</configuration>
</plugin>
[2/3] commons-rng git commit: Unused "import".
Posted by er...@apache.org.
Unused "import".
Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/8714ca78
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/8714ca78
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/8714ca78
Branch: refs/heads/master
Commit: 8714ca78974bed5d629dfc5868a3a66d23b6b794
Parents: 6ee82f1
Author: Gilles <er...@apache.org>
Authored: Wed Jan 24 00:42:55 2018 +0100
Committer: Gilles <er...@apache.org>
Committed: Wed Jan 24 00:42:55 2018 +0100
----------------------------------------------------------------------
.../rng/sampling/DiscreteProbabilityCollectionSampler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/8714ca78/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java
----------------------------------------------------------------------
diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java
index 8f87c15..8c77da0 100644
--- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java
+++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/DiscreteProbabilityCollectionSampler.java
@@ -17,7 +17,6 @@
package org.apache.commons.rng.sampling;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
@@ -27,7 +26,7 @@ import java.util.Arrays;
import org.apache.commons.rng.UniformRandomProvider;
/**
- * Sampling from a {@link Collection} of items with user-defined
+ * Sampling from a collection of items with user-defined
* <a href="http://en.wikipedia.org/wiki/Probability_distribution#Discrete_probability_distribution">
* probabilities</a>.
* Note that if all unique items are assigned the same probability,
@@ -157,6 +156,7 @@ public class DiscreteProbabilityCollectionSampler<T> {
* @throws IllegalArgumentException if the number of items in the
* {@code collection} is not equal to the number of provided
* {@code probabilities}.
+ * @param <T> Type of items in the collection.
*/
private static <T> Map<T, Double> consolidate(List<T> collection,
double[] probabilities) {
[3/3] commons-rng git commit: Minor fixes (CheckStyle, FindBugs).
Posted by er...@apache.org.
Minor fixes (CheckStyle, FindBugs).
Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/31045880
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/31045880
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/31045880
Branch: refs/heads/master
Commit: 31045880c65570d0fc4ef132f6b3959f1ce20d6a
Parents: 8714ca7
Author: Gilles <er...@apache.org>
Authored: Wed Jan 24 00:48:27 2018 +0100
Committer: Gilles <er...@apache.org>
Committed: Wed Jan 24 00:48:27 2018 +0100
----------------------------------------------------------------------
.../commons/rng/jmh/distribution/NextGaussianPerformance.java | 2 +-
.../apache/commons/rng/jmh/distribution/SamplersPerformance.java | 2 +-
.../distribution/AhrensDieterMarsagliaTsangGammaSampler.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/31045880/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/NextGaussianPerformance.java
----------------------------------------------------------------------
diff --git a/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/NextGaussianPerformance.java b/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/NextGaussianPerformance.java
index 21c4b39..018ded8 100644
--- a/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/NextGaussianPerformance.java
+++ b/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/NextGaussianPerformance.java
@@ -42,7 +42,7 @@ import java.util.Random;
@Fork(value = 1, jvmArgs = {"-server", "-Xms128M", "-Xmx128M"})
public class NextGaussianPerformance {
/** Number of samples per run. */
- private final int NUM_SAMPLES = 10000000;
+ private static final int NUM_SAMPLES = 10000000;
/** JDK's generator. */
private final Random random = new Random();
/**
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/31045880/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/SamplersPerformance.java
----------------------------------------------------------------------
diff --git a/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/SamplersPerformance.java b/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/SamplersPerformance.java
index 37ca30a..b438b57 100644
--- a/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/SamplersPerformance.java
+++ b/commons-rng-jmh/src/main/java/org/apache/commons/rng/jmh/distribution/SamplersPerformance.java
@@ -59,7 +59,7 @@ import org.apache.commons.rng.sampling.distribution.PoissonSampler;
@Fork(value = 1, jvmArgs = {"-server", "-Xms128M", "-Xmx128M"})
public class SamplersPerformance {
/** Number of samples per run. */
- private final int NUM_SAMPLES = 10000000;
+ private static final int NUM_SAMPLES = 10000000;
/**
* The benchmark state (retrieve the various "RandomSource"s).
http://git-wip-us.apache.org/repos/asf/commons-rng/blob/31045880/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java
----------------------------------------------------------------------
diff --git a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java
index 7a41197..cbe327c 100644
--- a/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java
+++ b/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling/distribution/AhrensDieterMarsagliaTsangGammaSampler.java
@@ -117,7 +117,7 @@ public class AhrensDieterMarsagliaTsangGammaSampler
} else {
while (true) {
final double x = gaussian.sample();
- final double oPcTx = (1 + cOptim * x);
+ final double oPcTx = 1 + cOptim * x;
final double v = oPcTx * oPcTx * oPcTx;
if (v <= 0) {