From 7b93748c0bd32b87f269f6f7cbe3b54a66a9c51f Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Sat, 26 Sep 2020 11:34:26 +0200 Subject: [PATCH] Renamed GetUniform --- FastRng/Distributions/Exponential.cs | 4 ++-- FastRng/Distributions/Gamma.cs | 4 ++-- FastRng/Distributions/Normal.cs | 4 ++-- FastRng/Distributions/Uniform.cs | 2 +- FastRng/IRandom.cs | 2 +- FastRng/MultiThreadedRng.cs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/FastRng/Distributions/Exponential.cs b/FastRng/Distributions/Exponential.cs index c3f62d1..c1da09d 100644 --- a/FastRng/Distributions/Exponential.cs +++ b/FastRng/Distributions/Exponential.cs @@ -28,9 +28,9 @@ namespace FastRng.Distributions return 0; if(this.Mean == 1) - return -Math.Log(await this.Random.GetUniformDouble(token)); + return -Math.Log(await this.Random.GetUniform(token)); else - return this.Mean * -Math.Log(await this.Random.GetUniformDouble(token)); + return this.Mean * -Math.Log(await this.Random.GetUniform(token)); } } } \ No newline at end of file diff --git a/FastRng/Distributions/Gamma.cs b/FastRng/Distributions/Gamma.cs index 88ef91f..4885e73 100644 --- a/FastRng/Distributions/Gamma.cs +++ b/FastRng/Distributions/Gamma.cs @@ -49,7 +49,7 @@ namespace FastRng.Distributions while (v <= 0.0); v = v * v * v; - var u = await this.Random.GetUniformDouble(token); + var u = await this.Random.GetUniform(token); var xSquared = x * x; if (u < 1.0 - 0.0331 * xSquared * xSquared || Math.Log(u) < 0.5 * xSquared + d * (1.0 - v + Math.Log(v))) @@ -61,7 +61,7 @@ namespace FastRng.Distributions var dist = new Gamma{ Scale = 1, Shape = 1 + this.Shape}; var g = await this.Random.NextNumber(0.0f, 1.0f, dist, token); // TODO: Use double - var w = await this.Random.GetUniformDouble(token); + var w = await this.Random.GetUniform(token); return this.Scale * g * Math.Pow(w, 1.0 / this.Shape); } } diff --git a/FastRng/Distributions/Normal.cs b/FastRng/Distributions/Normal.cs index 5ecdad3..ba88a95 100644 --- a/FastRng/Distributions/Normal.cs +++ b/FastRng/Distributions/Normal.cs @@ -29,8 +29,8 @@ namespace FastRng.Distributions if (this.Random == null) return 0; - var u1 = await this.Random.GetUniformDouble(token); - var u2 = await this.Random.GetUniformDouble(token); + var u1 = await this.Random.GetUniform(token); + var u2 = await this.Random.GetUniform(token); var r = Math.Sqrt(-2.0 * Math.Log(u1)); var theta = 2.0 * Math.PI * u2; var value = r * Math.Sin(theta); diff --git a/FastRng/Distributions/Uniform.cs b/FastRng/Distributions/Uniform.cs index 0799b8e..9a797fe 100644 --- a/FastRng/Distributions/Uniform.cs +++ b/FastRng/Distributions/Uniform.cs @@ -7,6 +7,6 @@ namespace FastRng.Distributions { public IRandom Random { get; set; } - public async Task GetDistributedValue(CancellationToken token = default) => this.Random == null ? 0 : await this.Random.GetUniformDouble(token); + public async Task GetDistributedValue(CancellationToken token = default) => this.Random == null ? 0 : await this.Random.GetUniform(token); } } \ No newline at end of file diff --git a/FastRng/IRandom.cs b/FastRng/IRandom.cs index f75699b..8ba83d5 100644 --- a/FastRng/IRandom.cs +++ b/FastRng/IRandom.cs @@ -7,7 +7,7 @@ namespace FastRng { public interface IRandom { - public Task GetUniformDouble(CancellationToken cancel = default); + public Task GetUniform(CancellationToken cancel = default); public Task NextNumber(uint rangeStart, uint rangeEnd, IDistribution distribution, CancellationToken cancel = default); diff --git a/FastRng/MultiThreadedRng.cs b/FastRng/MultiThreadedRng.cs index 0e41672..7a72391 100644 --- a/FastRng/MultiThreadedRng.cs +++ b/FastRng/MultiThreadedRng.cs @@ -133,7 +133,7 @@ namespace FastRng #region Implementing interface - public async Task GetUniformDouble(CancellationToken cancel = default) => await this.channelRandomUniformDistributedDouble.Reader.ReadAsync(cancel); + public async Task GetUniform(CancellationToken cancel = default) => await this.channelRandomUniformDistributedDouble.Reader.ReadAsync(cancel); public async Task NextNumber(uint rangeStart, uint rangeEnd, IDistribution distribution, CancellationToken cancel = default) {