Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C294A200C6C for ; Thu, 20 Apr 2017 13:34:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C13A8160B91; Thu, 20 Apr 2017 11:34:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2FBB0160BC8 for ; Thu, 20 Apr 2017 13:34:03 +0200 (CEST) Received: (qmail 66358 invoked by uid 500); 20 Apr 2017 11:34:02 -0000 Mailing-List: contact notifications-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list notifications@commons.apache.org Received: (qmail 65585 invoked by uid 99); 20 Apr 2017 11:34:01 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Apr 2017 11:34:01 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6F8FA3A184D for ; Thu, 20 Apr 2017 11:34:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1010778 [27/39] - in /websites/production/commons/content/proper/commons-rng: ./ commons-rng-client-api/ commons-rng-client-api/apidocs/ commons-rng-client-api/apidocs/org/apache/commons/rng/ commons-rng-client-api/apidocs/org/apache/commo... Date: Thu, 20 Apr 2017 11:33:54 -0000 To: notifications@commons.apache.org From: erans@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170420113400.6F8FA3A184D@svn01-us-west.apache.org> archived-at: Thu, 20 Apr 2017 11:34:08 -0000 Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/team-list.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/team-list.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/team-list.html Thu Apr 20 11:33:45 2017 @@ -1,13 +1,13 @@ - + RNG – Project Team @@ -40,8 +40,8 @@ Apache Commons RNG Sampling ™
    -
  • Last Published: 12 December 2016
    • -
  • |
  • Version: 1.0
    • +
  • Last Published: 20 April 2017
    • +
  • |
  • Version: 1.1-SNAPSHOT
  • @@ -134,7 +134,7 @@
- @@ -269,7 +269,7 @@
-

Copyright © 2016 +

Copyright © 2016-2017 The Apache Software Foundation. All Rights Reserved.

Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/index.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/index.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/index.html Thu Apr 20 11:33:45 2017 @@ -4,7 +4,7 @@ - Apache Commons RNG Sampling 1.0 Reference + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/CollectionSamplerTest.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/CollectionSamplerTest.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/CollectionSamplerTest.html Thu Apr 20 11:33:45 2017 @@ -64,6 +64,6 @@ 56 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/ListSamplerTest.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/ListSamplerTest.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/ListSamplerTest.html Thu Apr 20 11:33:45 2017 @@ -179,6 +179,6 @@ 171 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/PermutationSamplerTest.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/PermutationSamplerTest.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/PermutationSamplerTest.html Thu Apr 20 11:33:45 2017 @@ -219,6 +219,6 @@ 211 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplerParametricTest.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplerParametricTest.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplerParametricTest.html Thu Apr 20 11:33:45 2017 @@ -140,6 +140,6 @@ 132 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplerTestData.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplerTestData.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplerTestData.html Thu Apr 20 11:33:45 2017 @@ -54,6 +54,6 @@ 46 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/ContinuousSamplersList.html Thu Apr 20 11:33:45 2017 @@ -49,216 +49,227 @@ 41 final double sigmaNormal = 6.789; 42 add(LIST, new org.apache.commons.math3.distribution.NormalDistribution(meanNormal, sigmaNormal), 43 RandomSource.create(RandomSource.KISS)); -44 // Gaussian ("Box-Muller"). +44 // Gaussian (DEPRECATED "Box-Muller"). 45 add(LIST, new org.apache.commons.math3.distribution.NormalDistribution(meanNormal, sigmaNormal), 46 new BoxMullerGaussianSampler(RandomSource.create(RandomSource.MT), meanNormal, sigmaNormal)); -47 -48 // Beta ("inverse method"). -49 final double alphaBeta = 4.3; -50 final double betaBeta = 2.1; -51 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(alphaBeta, betaBeta), -52 RandomSource.create(RandomSource.ISAAC)); -53 // Beta ("Cheng"). -54 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(alphaBeta, betaBeta), -55 new ChengBetaSampler(RandomSource.create(RandomSource.MWC_256), alphaBeta, betaBeta)); -56 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(betaBeta, alphaBeta), -57 new ChengBetaSampler(RandomSource.create(RandomSource.WELL_19937_A), betaBeta, alphaBeta)); -58 // Beta ("Cheng", alternate algorithm). -59 final double alphaBetaAlt = 0.5678; -60 final double betaBetaAlt = 0.1234; -61 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(alphaBetaAlt, betaBetaAlt), -62 new ChengBetaSampler(RandomSource.create(RandomSource.WELL_512_A), alphaBetaAlt, betaBetaAlt)); -63 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(betaBetaAlt, alphaBetaAlt), -64 new ChengBetaSampler(RandomSource.create(RandomSource.WELL_19937_C), betaBetaAlt, alphaBetaAlt)); -65 -66 // Cauchy ("inverse method"). -67 final double medianCauchy = 0.123; -68 final double scaleCauchy = 4.5; -69 add(LIST, new org.apache.commons.math3.distribution.CauchyDistribution(medianCauchy, scaleCauchy), -70 RandomSource.create(RandomSource.WELL_19937_C)); -71 -72 // Chi-square ("inverse method"). -73 final int dofChi2 = 12; -74 add(LIST, new org.apache.commons.math3.distribution.ChiSquaredDistribution(dofChi2), -75 RandomSource.create(RandomSource.WELL_19937_A)); -76 -77 // Exponential ("inverse method"). -78 final double meanExp = 3.45; -79 add(LIST, new org.apache.commons.math3.distribution.ExponentialDistribution(meanExp), -80 RandomSource.create(RandomSource.WELL_44497_A)); -81 // Exponential. -82 add(LIST, new org.apache.commons.math3.distribution.ExponentialDistribution(meanExp), -83 new AhrensDieterExponentialSampler(RandomSource.create(RandomSource.MT), meanExp)); +47 // Gaussian ("Box-Muller"). +48 add(LIST, new org.apache.commons.math3.distribution.NormalDistribution(meanNormal, sigmaNormal), +49 new GaussianSampler(new BoxMullerNormalizedGaussianSampler(RandomSource.create(RandomSource.MT)), +50 meanNormal, sigmaNormal)); +51 // Gaussian ("Marsaglia"). +52 add(LIST, new org.apache.commons.math3.distribution.NormalDistribution(meanNormal, sigmaNormal), +53 new GaussianSampler(new MarsagliaNormalizedGaussianSampler(RandomSource.create(RandomSource.MT)), +54 meanNormal, sigmaNormal)); +55 +56 // Beta ("inverse method"). +57 final double alphaBeta = 4.3; +58 final double betaBeta = 2.1; +59 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(alphaBeta, betaBeta), +60 RandomSource.create(RandomSource.ISAAC)); +61 // Beta ("Cheng"). +62 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(alphaBeta, betaBeta), +63 new ChengBetaSampler(RandomSource.create(RandomSource.MWC_256), alphaBeta, betaBeta)); +64 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(betaBeta, alphaBeta), +65 new ChengBetaSampler(RandomSource.create(RandomSource.WELL_19937_A), betaBeta, alphaBeta)); +66 // Beta ("Cheng", alternate algorithm). +67 final double alphaBetaAlt = 0.5678; +68 final double betaBetaAlt = 0.1234; +69 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(alphaBetaAlt, betaBetaAlt), +70 new ChengBetaSampler(RandomSource.create(RandomSource.WELL_512_A), alphaBetaAlt, betaBetaAlt)); +71 add(LIST, new org.apache.commons.math3.distribution.BetaDistribution(betaBetaAlt, alphaBetaAlt), +72 new ChengBetaSampler(RandomSource.create(RandomSource.WELL_19937_C), betaBetaAlt, alphaBetaAlt)); +73 +74 // Cauchy ("inverse method"). +75 final double medianCauchy = 0.123; +76 final double scaleCauchy = 4.5; +77 add(LIST, new org.apache.commons.math3.distribution.CauchyDistribution(medianCauchy, scaleCauchy), +78 RandomSource.create(RandomSource.WELL_19937_C)); +79 +80 // Chi-square ("inverse method"). +81 final int dofChi2 = 12; +82 add(LIST, new org.apache.commons.math3.distribution.ChiSquaredDistribution(dofChi2), +83 RandomSource.create(RandomSource.WELL_19937_A)); 84 -85 // F ("inverse method"). -86 final int numDofF = 4; -87 final int denomDofF = 7; -88 add(LIST, new org.apache.commons.math3.distribution.FDistribution(numDofF, denomDofF), -89 RandomSource.create(RandomSource.MT_64)); -90 -91 // Gamma ("inverse method"). -92 final double thetaGammaSmallerThanOne = 0.1234; -93 final double thetaGammaLargerThanOne = 2.345; -94 final double alphaGamma = 3.456; -95 add(LIST, new org.apache.commons.math3.distribution.GammaDistribution(thetaGammaLargerThanOne, alphaGamma), -96 RandomSource.create(RandomSource.SPLIT_MIX_64)); -97 // Gamma (theta < 1). -98 add(LIST, new org.apache.commons.math3.distribution.GammaDistribution(thetaGammaSmallerThanOne, alphaGamma), -99 new AhrensDieterMarsagliaTsangGammaSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S), -100 alphaGamma, thetaGammaSmallerThanOne)); -101 // Gamma (theta > 1). -102 add(LIST, new org.apache.commons.math3.distribution.GammaDistribution(thetaGammaLargerThanOne, alphaGamma), -103 new AhrensDieterMarsagliaTsangGammaSampler(RandomSource.create(RandomSource.WELL_44497_B), -104 alphaGamma, thetaGammaLargerThanOne)); -105 -106 // Gumbel ("inverse method"). -107 final double muGumbel = -4.56; -108 final double betaGumbel = 0.123; -109 add(LIST, new org.apache.commons.math3.distribution.GumbelDistribution(muGumbel, betaGumbel), -110 RandomSource.create(RandomSource.WELL_1024_A)); -111 -112 // Laplace ("inverse method"). -113 final double muLaplace = 12.3; -114 final double betaLaplace = 5.6; -115 add(LIST, new org.apache.commons.math3.distribution.LaplaceDistribution(muLaplace, betaLaplace), -116 RandomSource.create(RandomSource.MWC_256)); -117 -118 // Levy ("inverse method"). -119 final double muLevy = -1.098; -120 final double cLevy = 0.76; -121 add(LIST, new org.apache.commons.math3.distribution.LevyDistribution(muLevy, cLevy), -122 RandomSource.create(RandomSource.TWO_CMRES)); -123 -124 // Log normal ("inverse method"). -125 final double scaleLogNormal = 23.45; -126 final double shapeLogNormal = 0.1234; -127 add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal), -128 RandomSource.create(RandomSource.KISS)); -129 // Log normal ("Box-Muller"). -130 add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal), -131 new BoxMullerLogNormalSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S), scaleLogNormal, shapeLogNormal)); -132 -133 // Logistic ("inverse method"). -134 final double muLogistic = -123.456; -135 final double sLogistic = 7.89; -136 add(LIST, new org.apache.commons.math3.distribution.LogisticDistribution(muLogistic, sLogistic), -137 RandomSource.create(RandomSource.TWO_CMRES_SELECT, null, 2, 6)); -138 -139 // Nakagami ("inverse method"). -140 final double muNakagami = 78.9; -141 final double omegaNakagami = 23.4; -142 add(LIST, new org.apache.commons.math3.distribution.NakagamiDistribution(muNakagami, omegaNakagami), -143 RandomSource.create(RandomSource.TWO_CMRES_SELECT, null, 5, 3)); -144 -145 // Pareto ("inverse method"). -146 final double scalePareto = 23.45; -147 final double shapePareto = 0.1234; -148 add(LIST, new org.apache.commons.math3.distribution.ParetoDistribution(scalePareto, shapePareto), -149 RandomSource.create(RandomSource.TWO_CMRES_SELECT, null, 9, 11)); -150 // Pareto. -151 add(LIST, new org.apache.commons.math3.distribution.ParetoDistribution(scalePareto, shapePareto), -152 new InverseTransformParetoSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S), scalePareto, shapePareto)); -153 -154 // T ("inverse method"). -155 final double dofT = 0.76543; -156 add(LIST, new org.apache.commons.math3.distribution.TDistribution(dofT), -157 RandomSource.create(RandomSource.ISAAC)); -158 -159 // Triangular ("inverse method"). -160 final double aTriangle = -0.76543; -161 final double cTriangle = -0.65432; -162 final double bTriangle = -0.54321; -163 add(LIST, new org.apache.commons.math3.distribution.TriangularDistribution(aTriangle, cTriangle, bTriangle), -164 RandomSource.create(RandomSource.MT)); -165 -166 // Uniform ("inverse method"). -167 final double loUniform = -1.098; -168 final double hiUniform = 0.76; -169 add(LIST, new org.apache.commons.math3.distribution.UniformRealDistribution(loUniform, hiUniform), -170 RandomSource.create(RandomSource.TWO_CMRES)); -171 // Uniform. -172 add(LIST, new org.apache.commons.math3.distribution.UniformRealDistribution(loUniform, hiUniform), -173 new ContinuousUniformSampler(RandomSource.create(RandomSource.MT_64), loUniform, hiUniform)); -174 -175 // Weibull ("inverse method"). -176 final double alphaWeibull = 678.9; -177 final double betaWeibull = 98.76; -178 add(LIST, new org.apache.commons.math3.distribution.WeibullDistribution(alphaWeibull, betaWeibull), -179 RandomSource.create(RandomSource.WELL_44497_B)); -180 } catch (Exception e) { -181 System.err.println("Unexpected exception while creating the list of samplers: " + e); -182 e.printStackTrace(System.err); -183 throw new RuntimeException(e); -184 } -185 } -186 -187 /** -188 * Class contains only static methods. -189 */ -190 private ContinuousSamplersList() {} -191 -192 /** -193 * @param list List of data (one the "parameters" tested by the Junit parametric test). -194 * @param dist Distribution to which the samples are supposed to conform. -195 * @param rng Generator of uniformly distributed sequences. -196 */ -197 private static void add(List<ContinuousSamplerTestData[]> list, -198 final org.apache.commons.math3.distribution.RealDistribution dist, -199 UniformRandomProvider rng) { -200 final ContinuousSampler inverseMethodSampler = -201 new InverseTransformContinuousSampler(rng, -202 new ContinuousInverseCumulativeProbabilityFunction() { -203 @Override -204 public double inverseCumulativeProbability(double p) { -205 return dist.inverseCumulativeProbability(p); -206 } -207 @Override -208 public String toString() { -209 return dist.toString(); -210 } -211 }); -212 list.add(new ContinuousSamplerTestData[] { new ContinuousSamplerTestData(inverseMethodSampler, -213 getDeciles(dist)) }); -214 } -215 -216 /** -217 * @param list List of data (one the "parameters" tested by the Junit parametric test). -218 * @param dist Distribution to which the samples are supposed to conform. -219 * @param sampler Sampler. -220 */ -221 private static void add(List<ContinuousSamplerTestData[]> list, -222 final org.apache.commons.math3.distribution.RealDistribution dist, -223 final ContinuousSampler sampler) { -224 list.add(new ContinuousSamplerTestData[] { new ContinuousSamplerTestData(sampler, -225 getDeciles(dist)) }); -226 } -227 -228 /** -229 * Subclasses that are "parametric" tests can forward the call to -230 * the "@Parameters"-annotated method to this method. -231 * -232 * @return the list of all generators. -233 */ -234 public static Iterable<ContinuousSamplerTestData[]> list() { -235 return Collections.unmodifiableList(LIST); -236 } -237 -238 /** -239 * @param dist Distribution. -240 * @return the deciles of the given distribution. -241 */ -242 private static double[] getDeciles(org.apache.commons.math3.distribution.RealDistribution dist) { -243 final int last = 9; -244 final double[] deciles = new double[last]; -245 final double ten = 10; -246 for (int i = 0; i < last; i++) { -247 deciles[i] = dist.inverseCumulativeProbability((i + 1) / ten); -248 } -249 return deciles; -250 } -251 } +85 // Exponential ("inverse method"). +86 final double meanExp = 3.45; +87 add(LIST, new org.apache.commons.math3.distribution.ExponentialDistribution(meanExp), +88 RandomSource.create(RandomSource.WELL_44497_A)); +89 // Exponential. +90 add(LIST, new org.apache.commons.math3.distribution.ExponentialDistribution(meanExp), +91 new AhrensDieterExponentialSampler(RandomSource.create(RandomSource.MT), meanExp)); +92 +93 // F ("inverse method"). +94 final int numDofF = 4; +95 final int denomDofF = 7; +96 add(LIST, new org.apache.commons.math3.distribution.FDistribution(numDofF, denomDofF), +97 RandomSource.create(RandomSource.MT_64)); +98 +99 // Gamma ("inverse method"). +100 final double thetaGammaSmallerThanOne = 0.1234; +101 final double thetaGammaLargerThanOne = 2.345; +102 final double alphaGamma = 3.456; +103 add(LIST, new org.apache.commons.math3.distribution.GammaDistribution(thetaGammaLargerThanOne, alphaGamma), +104 RandomSource.create(RandomSource.SPLIT_MIX_64)); +105 // Gamma (theta < 1). +106 add(LIST, new org.apache.commons.math3.distribution.GammaDistribution(thetaGammaSmallerThanOne, alphaGamma), +107 new AhrensDieterMarsagliaTsangGammaSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S), +108 alphaGamma, thetaGammaSmallerThanOne)); +109 // Gamma (theta > 1). +110 add(LIST, new org.apache.commons.math3.distribution.GammaDistribution(thetaGammaLargerThanOne, alphaGamma), +111 new AhrensDieterMarsagliaTsangGammaSampler(RandomSource.create(RandomSource.WELL_44497_B), +112 alphaGamma, thetaGammaLargerThanOne)); +113 +114 // Gumbel ("inverse method"). +115 final double muGumbel = -4.56; +116 final double betaGumbel = 0.123; +117 add(LIST, new org.apache.commons.math3.distribution.GumbelDistribution(muGumbel, betaGumbel), +118 RandomSource.create(RandomSource.WELL_1024_A)); +119 +120 // Laplace ("inverse method"). +121 final double muLaplace = 12.3; +122 final double betaLaplace = 5.6; +123 add(LIST, new org.apache.commons.math3.distribution.LaplaceDistribution(muLaplace, betaLaplace), +124 RandomSource.create(RandomSource.MWC_256)); +125 +126 // Levy ("inverse method"). +127 final double muLevy = -1.098; +128 final double cLevy = 0.76; +129 add(LIST, new org.apache.commons.math3.distribution.LevyDistribution(muLevy, cLevy), +130 RandomSource.create(RandomSource.TWO_CMRES)); +131 +132 // Log normal ("inverse method"). +133 final double scaleLogNormal = 23.45; +134 final double shapeLogNormal = 0.1234; +135 add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal), +136 RandomSource.create(RandomSource.KISS)); +137 // Log normal ("Box-Muller"). +138 add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal), +139 new BoxMullerLogNormalSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S), scaleLogNormal, shapeLogNormal)); +140 // Log normal ("Marsaglia"). +141 add(LIST, new org.apache.commons.math3.distribution.LogNormalDistribution(scaleLogNormal, shapeLogNormal), +142 new MarsagliaLogNormalSampler(RandomSource.create(RandomSource.MT_64), scaleLogNormal, shapeLogNormal)); +143 +144 // Logistic ("inverse method"). +145 final double muLogistic = -123.456; +146 final double sLogistic = 7.89; +147 add(LIST, new org.apache.commons.math3.distribution.LogisticDistribution(muLogistic, sLogistic), +148 RandomSource.create(RandomSource.TWO_CMRES_SELECT, null, 2, 6)); +149 +150 // Nakagami ("inverse method"). +151 final double muNakagami = 78.9; +152 final double omegaNakagami = 23.4; +153 add(LIST, new org.apache.commons.math3.distribution.NakagamiDistribution(muNakagami, omegaNakagami), +154 RandomSource.create(RandomSource.TWO_CMRES_SELECT, null, 5, 3)); +155 +156 // Pareto ("inverse method"). +157 final double scalePareto = 23.45; +158 final double shapePareto = 0.1234; +159 add(LIST, new org.apache.commons.math3.distribution.ParetoDistribution(scalePareto, shapePareto), +160 RandomSource.create(RandomSource.TWO_CMRES_SELECT, null, 9, 11)); +161 // Pareto. +162 add(LIST, new org.apache.commons.math3.distribution.ParetoDistribution(scalePareto, shapePareto), +163 new InverseTransformParetoSampler(RandomSource.create(RandomSource.XOR_SHIFT_1024_S), scalePareto, shapePareto)); +164 +165 // T ("inverse method"). +166 final double dofT = 0.76543; +167 add(LIST, new org.apache.commons.math3.distribution.TDistribution(dofT), +168 RandomSource.create(RandomSource.ISAAC)); +169 +170 // Triangular ("inverse method"). +171 final double aTriangle = -0.76543; +172 final double cTriangle = -0.65432; +173 final double bTriangle = -0.54321; +174 add(LIST, new org.apache.commons.math3.distribution.TriangularDistribution(aTriangle, cTriangle, bTriangle), +175 RandomSource.create(RandomSource.MT)); +176 +177 // Uniform ("inverse method"). +178 final double loUniform = -1.098; +179 final double hiUniform = 0.76; +180 add(LIST, new org.apache.commons.math3.distribution.UniformRealDistribution(loUniform, hiUniform), +181 RandomSource.create(RandomSource.TWO_CMRES)); +182 // Uniform. +183 add(LIST, new org.apache.commons.math3.distribution.UniformRealDistribution(loUniform, hiUniform), +184 new ContinuousUniformSampler(RandomSource.create(RandomSource.MT_64), loUniform, hiUniform)); +185 +186 // Weibull ("inverse method"). +187 final double alphaWeibull = 678.9; +188 final double betaWeibull = 98.76; +189 add(LIST, new org.apache.commons.math3.distribution.WeibullDistribution(alphaWeibull, betaWeibull), +190 RandomSource.create(RandomSource.WELL_44497_B)); +191 } catch (Exception e) { +192 System.err.println("Unexpected exception while creating the list of samplers: " + e); +193 e.printStackTrace(System.err); +194 throw new RuntimeException(e); +195 } +196 } +197 +198 /** +199 * Class contains only static methods. +200 */ +201 private ContinuousSamplersList() {} +202 +203 /** +204 * @param list List of data (one the "parameters" tested by the Junit parametric test). +205 * @param dist Distribution to which the samples are supposed to conform. +206 * @param rng Generator of uniformly distributed sequences. +207 */ +208 private static void add(List<ContinuousSamplerTestData[]> list, +209 final org.apache.commons.math3.distribution.RealDistribution dist, +210 UniformRandomProvider rng) { +211 final ContinuousSampler inverseMethodSampler = +212 new InverseTransformContinuousSampler(rng, +213 new ContinuousInverseCumulativeProbabilityFunction() { +214 @Override +215 public double inverseCumulativeProbability(double p) { +216 return dist.inverseCumulativeProbability(p); +217 } +218 @Override +219 public String toString() { +220 return dist.toString(); +221 } +222 }); +223 list.add(new ContinuousSamplerTestData[] { new ContinuousSamplerTestData(inverseMethodSampler, +224 getDeciles(dist)) }); +225 } +226 +227 /** +228 * @param list List of data (one the "parameters" tested by the Junit parametric test). +229 * @param dist Distribution to which the samples are supposed to conform. +230 * @param sampler Sampler. +231 */ +232 private static void add(List<ContinuousSamplerTestData[]> list, +233 final org.apache.commons.math3.distribution.RealDistribution dist, +234 final ContinuousSampler sampler) { +235 list.add(new ContinuousSamplerTestData[] { new ContinuousSamplerTestData(sampler, +236 getDeciles(dist)) }); +237 } +238 +239 /** +240 * Subclasses that are "parametric" tests can forward the call to +241 * the "@Parameters"-annotated method to this method. +242 * +243 * @return the list of all generators. +244 */ +245 public static Iterable<ContinuousSamplerTestData[]> list() { +246 return Collections.unmodifiableList(LIST); +247 } +248 +249 /** +250 * @param dist Distribution. +251 * @return the deciles of the given distribution. +252 */ +253 private static double[] getDeciles(org.apache.commons.math3.distribution.RealDistribution dist) { +254 final int last = 9; +255 final double[] deciles = new double[last]; +256 final double ten = 10; +257 for (int i = 0; i < last; i++) { +258 deciles[i] = dist.inverseCumulativeProbability((i + 1) / ten); +259 } +260 return deciles; +261 } +262 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplerParametricTest.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplerParametricTest.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplerParametricTest.html Thu Apr 20 11:33:45 2017 @@ -134,6 +134,6 @@ 126 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplerTestData.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplerTestData.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplerTestData.html Thu Apr 20 11:33:45 2017 @@ -66,6 +66,6 @@ 58 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplersList.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplersList.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/DiscreteSamplersList.html Thu Apr 20 11:33:45 2017 @@ -221,6 +221,6 @@ 213 }
- + Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/package-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/package-frame.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/package-frame.html Thu Apr 20 11:33:45 2017 @@ -3,7 +3,7 @@ - Apache Commons RNG Sampling 1.0 Reference Package org.apache.commons.rng.sampling.distribution + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference Package org.apache.commons.rng.sampling.distribution Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/package-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/package-summary.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/distribution/package-summary.html Thu Apr 20 11:33:45 2017 @@ -3,7 +3,7 @@ - Apache Commons RNG Sampling 1.0 Reference Package org.apache.commons.rng.sampling.distribution + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference Package org.apache.commons.rng.sampling.distribution @@ -88,7 +88,7 @@
\ No newline at end of file Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/package-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/package-frame.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/package-frame.html Thu Apr 20 11:33:45 2017 @@ -3,7 +3,7 @@ - Apache Commons RNG Sampling 1.0 Reference Package org.apache.commons.rng.sampling + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference Package org.apache.commons.rng.sampling Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/package-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/package-summary.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/org/apache/commons/rng/sampling/package-summary.html Thu Apr 20 11:33:45 2017 @@ -3,7 +3,7 @@ - Apache Commons RNG Sampling 1.0 Reference Package org.apache.commons.rng.sampling + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference Package org.apache.commons.rng.sampling @@ -73,7 +73,7 @@
\ No newline at end of file Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/overview-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/overview-frame.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/overview-frame.html Thu Apr 20 11:33:45 2017 @@ -3,7 +3,7 @@ - Apache Commons RNG Sampling 1.0 Reference + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/overview-summary.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/overview-summary.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref-test/overview-summary.html Thu Apr 20 11:33:45 2017 @@ -3,7 +3,7 @@ - Apache Commons RNG Sampling 1.0 Reference + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference @@ -24,7 +24,7 @@ -

Apache Commons RNG Sampling 1.0 Reference

+

Apache Commons RNG Sampling 1.1-SNAPSHOT Reference

@@ -65,7 +65,7 @@
\ No newline at end of file Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref/allclasses-frame.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref/allclasses-frame.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref/allclasses-frame.html Thu Apr 20 11:33:45 2017 @@ -24,6 +24,9 @@ BoxMullerLogNormalSampler
  • + BoxMullerNormalizedGaussianSampler +
    • +
  • ChengBetaSampler
  • @@ -51,6 +54,9 @@ FactorialLog
  • + GaussianSampler +
    • +
  • InternalGamma
  • @@ -69,6 +75,15 @@ ListSampler
  • + MarsagliaLogNormalSampler +
    • +
  • + MarsagliaNormalizedGaussianSampler +
    • +
  • + NormalizedGaussianSampler +
    • +
  • PermutationSampler
  • Modified: websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref/index.html ============================================================================== --- websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref/index.html (original) +++ websites/production/commons/content/proper/commons-rng/commons-rng-sampling/xref/index.html Thu Apr 20 11:33:45 2017 @@ -4,7 +4,7 @@ - Apache Commons RNG Sampling 1.0 Reference + Apache Commons RNG Sampling 1.1-SNAPSHOT Reference