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/11 11:42:23 UTC

[6/8] commons-rng git commit: RNG-43: Update unit test.

RNG-43: Update unit test.


Project: http://git-wip-us.apache.org/repos/asf/commons-rng/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rng/commit/7467b1d8
Tree: http://git-wip-us.apache.org/repos/asf/commons-rng/tree/7467b1d8
Diff: http://git-wip-us.apache.org/repos/asf/commons-rng/diff/7467b1d8

Branch: refs/heads/master
Commit: 7467b1d83bb35b040009b91ec09289bdbea0363f
Parents: cc9aeef
Author: Gilles <er...@apache.org>
Authored: Wed Jan 10 17:42:26 2018 +0100
Committer: Gilles <er...@apache.org>
Committed: Wed Jan 10 17:42:26 2018 +0100

----------------------------------------------------------------------
 .../distribution/ContinuousSamplersList.java       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-rng/blob/7467b1d8/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.java
----------------------------------------------------------------------
diff --git a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.java b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.java
index bf6e925..527758d 100644
--- a/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.java
+++ b/commons-rng-sampling/src/test/java/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.java
@@ -134,16 +134,25 @@ public class ContinuousSamplersList {
                 RandomSource.create(RandomSource.TWO_CMRES));
 
             // Log normal ("inverse method").
-            final double scaleLogNormal = 23.45;
+            final double scaleLogNormal = 2.345;
             final double shapeLogNormal = 0.1234;
             add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal),
                 RandomSource.create(RandomSource.KISS));
-            // Log normal ("Box-Muller").
+            // Log-normal (DEPRECATED "Box-Muller").
             add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal),
                 new BoxMullerLogNormalSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S), scaleLogNormal, shapeLogNormal));
-            // Log normal ("Marsaglia").
+            // Log-normal ("Box-Muller").
             add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal),
-                new MarsagliaLogNormalSampler(RandomSource.create(RandomSource.MT_64), scaleLogNormal, shapeLogNormal));
+                new LogNormalSampler(new BoxMullerNormalizedGaussianSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S)),
+                                     scaleLogNormal, shapeLogNormal));
+            // Log-normal ("Marsaglia").
+            add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal),
+                new LogNormalSampler(new MarsagliaNormalizedGaussianSampler(RandomSource.create(RandomSource.MT_64)),
+                                     scaleLogNormal, shapeLogNormal));
+            // Log-normal ("Ziggurat").
+            add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal),
+                new LogNormalSampler(new ZigguratNormalizedGaussianSampler(RandomSource.create(RandomSource.MWC_256)),
+                                     scaleLogNormal, shapeLogNormal));
 
             // Logistic ("inverse method").
             final double muLogistic = -123.456;