Depend on "Commons RNG" (v1.0).
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/c9709dd4 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/c9709dd4 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/c9709dd4 Branch: refs/heads/master Commit: c9709dd49d438e17ebb5bdc003b5353b0201c432 Parents: 0956e2d Author: Gilles <er...@apache.org> Authored: Wed Dec 14 16:51:21 2016 +0100 Committer: Gilles <er...@apache.org> Committed: Wed Dec 14 17:38:42 2016 +0100 ---------------------------------------------------------------------- .../math4/userguide/ClusterAlgorithmComparison.java | 10 +++++----- .../userguide/LowDiscrepancyGeneratorComparison.java | 2 +- .../commons/math4/userguide/filter/CannonballExample.java | 2 +- .../math4/userguide/filter/ConstantVoltageExample.java | 2 +- .../apache/commons/math4/userguide/genetics/Polygon.java | 2 +- .../commons/math4/userguide/geometry/GeometryExample.java | 2 +- .../userguide/rng/RandomNumberGeneratorBenchmark.java | 2 +- .../apache/commons/math4/userguide/sofm/ChineseRings.java | 2 +- .../math4/userguide/sofm/ChineseRingsClassifier.java | 2 +- src/userguide/pom.xml | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java b/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java index 05d86da..f4d7de1 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/ClusterAlgorithmComparison.java @@ -35,7 +35,8 @@ import javax.swing.JComponent; import javax.swing.JLabel; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; +import org.apache.commons.rng.sampling.ListSampler; import org.apache.commons.math4.distribution.RealDistribution; import org.apache.commons.math4.distribution.UniformRealDistribution; @@ -49,7 +50,6 @@ import org.apache.commons.math4.ml.clustering.DBSCANClusterer; import org.apache.commons.math4.ml.clustering.DoublePoint; import org.apache.commons.math4.ml.clustering.FuzzyKMeansClusterer; import org.apache.commons.math4.ml.clustering.KMeansPlusPlusClusterer; -import org.apache.commons.math4.random.JDKRandomAdaptor; import org.apache.commons.math4.random.SobolSequenceGenerator; import org.apache.commons.math4.util.FastMath; import org.apache.commons.math4.util.Pair; @@ -85,7 +85,7 @@ public class ClusterAlgorithmComparison { } if (shuffle) { - Collections.shuffle(points, new JDKRandomAdaptor(rng)); + ListSampler.shuffle(rng, points); } return points; @@ -115,7 +115,7 @@ public class ClusterAlgorithmComparison { } if (shuffle) { - Collections.shuffle(points, new JDKRandomAdaptor(rng)); + ListSampler.shuffle(rng, points); } return points; @@ -152,7 +152,7 @@ public class ClusterAlgorithmComparison { } if (shuffle) { - Collections.shuffle(points, new JDKRandomAdaptor(rng)); + ListSampler.shuffle(rng, points); } return points; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/LowDiscrepancyGeneratorComparison.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/LowDiscrepancyGeneratorComparison.java b/src/userguide/java/org/apache/commons/math4/userguide/LowDiscrepancyGeneratorComparison.java index f1b81d5..e43cba4 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/LowDiscrepancyGeneratorComparison.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/LowDiscrepancyGeneratorComparison.java @@ -33,7 +33,7 @@ import javax.swing.JLabel; import javax.swing.JTextArea; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; import org.apache.commons.math4.random.HaltonSequenceGenerator; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/filter/CannonballExample.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/filter/CannonballExample.java b/src/userguide/java/org/apache/commons/math4/userguide/filter/CannonballExample.java index b26a489..61cea88 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/filter/CannonballExample.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/filter/CannonballExample.java @@ -26,7 +26,7 @@ import javax.swing.JComponent; import javax.swing.JPanel; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.math4.filter.DefaultMeasurementModel; import org.apache.commons.math4.filter.DefaultProcessModel; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/filter/ConstantVoltageExample.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/filter/ConstantVoltageExample.java b/src/userguide/java/org/apache/commons/math4/userguide/filter/ConstantVoltageExample.java index 2dc414f..5faccc6 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/filter/ConstantVoltageExample.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/filter/ConstantVoltageExample.java @@ -26,7 +26,7 @@ import javax.swing.JComponent; import javax.swing.JPanel; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.math4.filter.DefaultMeasurementModel; import org.apache.commons.math4.filter.DefaultProcessModel; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/genetics/Polygon.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/genetics/Polygon.java b/src/userguide/java/org/apache/commons/math4/userguide/genetics/Polygon.java index c9cf278..ae35d51 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/genetics/Polygon.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/genetics/Polygon.java @@ -21,7 +21,7 @@ import java.awt.Graphics2D; import java.awt.geom.GeneralPath; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.math4.genetics.GeneticAlgorithm; import org.apache.commons.math4.util.FastMath; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/geometry/GeometryExample.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/geometry/GeometryExample.java b/src/userguide/java/org/apache/commons/math4/userguide/geometry/GeometryExample.java index c0aa91c..fb82522 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/geometry/GeometryExample.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/geometry/GeometryExample.java @@ -32,7 +32,7 @@ import javax.swing.JPanel; import javax.swing.JSplitPane; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.math4.geometry.enclosing.Encloser; import org.apache.commons.math4.geometry.enclosing.EnclosingBall; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/rng/RandomNumberGeneratorBenchmark.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/rng/RandomNumberGeneratorBenchmark.java b/src/userguide/java/org/apache/commons/math4/userguide/rng/RandomNumberGeneratorBenchmark.java index 836e41a..acb70e1 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/rng/RandomNumberGeneratorBenchmark.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/rng/RandomNumberGeneratorBenchmark.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.ArrayList; import java.util.Random; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.rng.UniformRandomProvider; import org.apache.commons.math4.random.RandomGenerator; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRings.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRings.java b/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRings.java index f906ac5..57393a6 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRings.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRings.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.userguide.sofm; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.math4.geometry.euclidean.threed.Vector3D; import org.apache.commons.math4.geometry.euclidean.threed.Rotation; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRingsClassifier.java ---------------------------------------------------------------------- diff --git a/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRingsClassifier.java b/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRingsClassifier.java index 7eef617..f6a420b 100644 --- a/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRingsClassifier.java +++ b/src/userguide/java/org/apache/commons/math4/userguide/sofm/ChineseRingsClassifier.java @@ -22,7 +22,7 @@ import java.io.PrintWriter; import java.io.IOException; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.rng.RandomSource; +import org.apache.commons.rng.simple.RandomSource; import org.apache.commons.math4.ml.neuralnet.SquareNeighbourhood; import org.apache.commons.math4.ml.neuralnet.FeatureInitializer; http://git-wip-us.apache.org/repos/asf/commons-math/blob/c9709dd4/src/userguide/pom.xml ---------------------------------------------------------------------- diff --git a/src/userguide/pom.xml b/src/userguide/pom.xml index dfcb010..c850c92 100644 --- a/src/userguide/pom.xml +++ b/src/userguide/pom.xml @@ -113,8 +113,8 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-rng</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>commons-rng-simple</artifactId> + <version>1.0</version> </dependency> </dependencies> </project>
