From 64eb75464487c093c630e9c5babe59f00e9d72ee Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Fri, 30 Oct 2020 22:24:09 +0100 Subject: [PATCH] Fixed test cases --- FastRngTests/Double/Distributions/Beta.cs | 39 +++++++++++++------- FastRngTests/Double/Distributions/Normal.cs | 10 ++++- FastRngTests/Double/Distributions/Uniform.cs | 17 +++++++-- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/FastRngTests/Double/Distributions/Beta.cs b/FastRngTests/Double/Distributions/Beta.cs index 190eff2..23105a3 100644 --- a/FastRngTests/Double/Distributions/Beta.cs +++ b/FastRngTests/Double/Distributions/Beta.cs @@ -15,24 +15,33 @@ namespace FastRngTests.Double.Distributions [Category(TestCategories.NORMAL)] public async Task TestBetaDistribution01() { - const double A = 2.0; - const double B = 2.0; - const double MEAN = A / (A + B); - const double VARIANCE = (A * B) / ((A + B) * (A + B) * (A + B + 1.0)); - var dist = new FastRng.Double.Distributions.BetaA2B2(); - var stats = new RunningStatistics(); + var fqa = new FrequencyAnalysis(); var rng = new MultiThreadedRng(); for (var n = 0; n < 100_000; n++) - stats.Push(await rng.NextNumber(dist)); + fqa.CountThis(await rng.NextNumber(dist)); rng.StopProducer(); - TestContext.WriteLine($"mean={MEAN} vs. {stats.Mean}"); - TestContext.WriteLine($"variance={VARIANCE} vs {stats.Variance}"); + var result = fqa.NormalizeAndPlotEvents(TestContext.WriteLine); - Assert.That(stats.Mean, Is.EqualTo(MEAN).Within(0.1), "Mean is out of range"); - Assert.That(stats.Variance, Is.EqualTo(VARIANCE).Within(0.01), "Variance is out of range"); + Assert.That(result[0], Is.EqualTo(0.0396).Within(0.3)); + Assert.That(result[1], Is.EqualTo(0.0784).Within(0.3)); + Assert.That(result[2], Is.EqualTo(0.1164).Within(0.3)); + + Assert.That(result[21], Is.EqualTo(0.6864).Within(0.3)); + Assert.That(result[22], Is.EqualTo(0.7084).Within(0.3)); + Assert.That(result[23], Is.EqualTo(0.7296).Within(0.3)); + + Assert.That(result[50], Is.EqualTo(0.9996).Within(0.3)); + + Assert.That(result[75], Is.EqualTo(0.7296).Within(0.3)); + Assert.That(result[85], Is.EqualTo(0.4816).Within(0.3)); + Assert.That(result[90], Is.EqualTo(0.3276).Within(0.3)); + + Assert.That(result[97], Is.EqualTo(0.0784).Within(0.3)); + Assert.That(result[98], Is.EqualTo(0.0396).Within(0.3)); + Assert.That(result[99], Is.EqualTo(0.0000).Within(0.3)); } [Test] @@ -42,9 +51,10 @@ namespace FastRngTests.Double.Distributions { var rng = new MultiThreadedRng(); var samples = new double[1_000]; + var dist = new FastRng.Double.Distributions.BetaA2B2(); for (var n = 0; n < samples.Length; n++) - samples[n] = await rng.NextNumber(-1.0, 1.0, new FastRng.Double.Distributions.BetaA2B2()); - + samples[n] = await rng.NextNumber(-1.0, 1.0, dist); + rng.StopProducer(); Assert.That(samples.Min(), Is.GreaterThanOrEqualTo(-1.0), "Min out of range"); Assert.That(samples.Max(), Is.LessThanOrEqualTo(1.0), "Max out of range"); @@ -57,8 +67,9 @@ namespace FastRngTests.Double.Distributions { var rng = new MultiThreadedRng(); var samples = new double[1_000]; + var dist = new FastRng.Double.Distributions.BetaA2B2(); for (var n = 0; n < samples.Length; n++) - samples[n] = await rng.NextNumber(0.0, 1.0, new FastRng.Double.Distributions.BetaA2B2()); + samples[n] = await rng.NextNumber(0.0, 1.0, dist); rng.StopProducer(); Assert.That(samples.Min(), Is.GreaterThanOrEqualTo(0.0), "Min is out of range"); diff --git a/FastRngTests/Double/Distributions/Normal.cs b/FastRngTests/Double/Distributions/Normal.cs index 36dc391..42a7bf7 100644 --- a/FastRngTests/Double/Distributions/Normal.cs +++ b/FastRngTests/Double/Distributions/Normal.cs @@ -20,15 +20,19 @@ namespace FastRngTests.Double.Distributions var dist = new FastRng.Double.Distributions.Normal(); var stats = new RunningStatistics(); + var fra = new FrequencyAnalysis(); var rng = new MultiThreadedRng(); for (var n = 0; n < 100_000; n++) { var nextNumber = await rng.NextNumber(dist); stats.Push(nextNumber); + fra.CountThis(nextNumber); } rng.StopProducer(); + fra.NormalizeAndPlotEvents(TestContext.WriteLine); + TestContext.WriteLine($"mean={MEAN} vs. {stats.Mean}"); TestContext.WriteLine($"variance={STANDARD_DEVIATION * STANDARD_DEVIATION} vs {stats.Variance}"); @@ -43,8 +47,9 @@ namespace FastRngTests.Double.Distributions { var rng = new MultiThreadedRng(); var samples = new double[1_000]; + var dist = new FastRng.Double.Distributions.Normal(); for (var n = 0; n < samples.Length; n++) - samples[n] = await rng.NextNumber(-1.0, 1.0, new FastRng.Double.Distributions.Normal()); + samples[n] = await rng.NextNumber(-1.0, 1.0, dist); rng.StopProducer(); Assert.That(samples.Min(), Is.GreaterThanOrEqualTo(-1.0), "Min is out of range"); @@ -58,8 +63,9 @@ namespace FastRngTests.Double.Distributions { var rng = new MultiThreadedRng(); var samples = new double[1_000]; + var dist = new FastRng.Double.Distributions.Normal(); for (var n = 0; n < samples.Length; n++) - samples[n] = await rng.NextNumber(0.0, 1.0, new FastRng.Double.Distributions.Normal()); + samples[n] = await rng.NextNumber(0.0, 1.0, dist); rng.StopProducer(); Assert.That(samples.Min(), Is.GreaterThanOrEqualTo(0.0), "Min is out of range"); diff --git a/FastRngTests/Double/Distributions/Uniform.cs b/FastRngTests/Double/Distributions/Uniform.cs index ff52db8..025952d 100644 --- a/FastRngTests/Double/Distributions/Uniform.cs +++ b/FastRngTests/Double/Distributions/Uniform.cs @@ -23,12 +23,19 @@ namespace FastRngTests.Double.Distributions const double VARIANCE = (1.0 / 12.0) * (B - A) * (B - A); var stats = new RunningStatistics(); + var fra = new FrequencyAnalysis(); var rng = new MultiThreadedRng(); for (var n = 0; n < 100_000; n++) - stats.Push(await rng.GetUniform()); - + { + var value = await rng.GetUniform(); + stats.Push(value); + fra.CountThis(value); + } + rng.StopProducer(); + fra.NormalizeAndPlotEvents(TestContext.WriteLine); + fra.PlotOccurence(TestContext.WriteLine); TestContext.WriteLine($"mean={MEAN} vs. {stats.Mean}"); TestContext.WriteLine($"variance={VARIANCE} vs {stats.Variance}"); @@ -113,8 +120,9 @@ namespace FastRngTests.Double.Distributions public async Task TestUniformGeneratorWithRange01() { var samples = new double[1_000]; + var dist = new FastRng.Double.Distributions.Uniform(); for (var n = 0; n < samples.Length; n++) - samples[n] = await rng.NextNumber(-1.0, 1.0, new FastRng.Double.Distributions.Uniform()); + samples[n] = await rng.NextNumber(-1.0, 1.0, dist); rng.StopProducer(); Assert.That(samples.Min(), Is.GreaterThanOrEqualTo(-1.0), "Min is out of range"); @@ -127,8 +135,9 @@ namespace FastRngTests.Double.Distributions public async Task TestUniformGeneratorWithRange02() { var samples = new double[1_000]; + var dist = new FastRng.Double.Distributions.Uniform(); for (var n = 0; n < samples.Length; n++) - samples[n] = await rng.NextNumber(0.0, 1.0, new FastRng.Double.Distributions.Uniform()); + samples[n] = await rng.NextNumber(0.0, 1.0, dist); Assert.That(samples.Min(), Is.GreaterThanOrEqualTo(0.0), "Min is out of range"); Assert.That(samples.Max(), Is.LessThanOrEqualTo(1.0), "Max is out of range");