Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 04:53:29 +01:00
Code Issues Projects Releases Wiki Activity

improved and cleaned up SingleRandom

Browse source
This commit is contained in:
Ell 2022-11-30 00:24:43 +01:00
parent edcaa84a2b
commit 8ffd9ab48a
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
MLEM/Misc/SingleRandom.cs
View file

@ -24,7 +24,7 @@ namespace MLEM.Misc {
/// </summary> /// </summary>
/// <param name="seeds">The seeds to use.</param> /// <param name="seeds">The seeds to use.</param>
/// <returns>The generated number.</returns> /// <returns>The generated number.</returns>
public static int Int(int[] seeds) { public static int Int(params int[] seeds) {
return (int) (SingleRandom.Single(seeds) * int.MaxValue); return (int) (SingleRandom.Single(seeds) * int.MaxValue);
} }
@ -46,7 +46,7 @@ namespace MLEM.Misc {
/// <param name="maxValue">The (exclusive) maximum value.</param> /// <param name="maxValue">The (exclusive) maximum value.</param>
/// <param name="seeds">The seeds to use.</param> /// <param name="seeds">The seeds to use.</param>
/// <returns>The generated number.</returns> /// <returns>The generated number.</returns>
public static int Int(int maxValue, int[] seeds) { public static int Int(int maxValue, params int[] seeds) {
return (int) (maxValue * SingleRandom.Single(seeds)); return (int) (maxValue * SingleRandom.Single(seeds));
} }
@ -70,7 +70,7 @@ namespace MLEM.Misc {
/// <param name="maxValue">The (exclusive) maximum value.</param> /// <param name="maxValue">The (exclusive) maximum value.</param>
/// <param name="seeds">The seeds to use.</param> /// <param name="seeds">The seeds to use.</param>
/// <returns>The generated number.</returns> /// <returns>The generated number.</returns>
public static int Int(int minValue, int maxValue, int[] seeds) { public static int Int(int minValue, int maxValue, params int[] seeds) {
return (int) ((maxValue - minValue) * SingleRandom.Single(seeds)) + minValue; return (int) ((maxValue - minValue) * SingleRandom.Single(seeds)) + minValue;
} }
@ -90,7 +90,7 @@ namespace MLEM.Misc {
/// </summary> /// </summary>
/// <param name="seeds">The seeds to use.</param> /// <param name="seeds">The seeds to use.</param>
/// <returns>The generated number.</returns> /// <returns>The generated number.</returns>
public static float Single(int[] seeds) { public static float Single(params int[] seeds) {
return (SingleRandom.Scramble(seeds) / (float) int.MaxValue + 1) / 2; return (SingleRandom.Scramble(seeds) / (float) int.MaxValue + 1) / 2;
} }
@ -112,7 +112,7 @@ namespace MLEM.Misc {
/// <param name="maxValue">The (exclusive) maximum value.</param> /// <param name="maxValue">The (exclusive) maximum value.</param>
/// <param name="seeds">The seeds to use.</param> /// <param name="seeds">The seeds to use.</param>
/// <returns>The generated number.</returns> /// <returns>The generated number.</returns>
public static float Single(float maxValue, int[] seeds) { public static float Single(float maxValue, params int[] seeds) {
return maxValue * SingleRandom.Single(seeds); return maxValue * SingleRandom.Single(seeds);
} }
@ -136,20 +136,24 @@ namespace MLEM.Misc {
/// <param name="maxValue">The (exclusive) maximum value.</param> /// <param name="maxValue">The (exclusive) maximum value.</param>
/// <param name="seeds">The seeds to use.</param> /// <param name="seeds">The seeds to use.</param>
/// <returns>The generated number.</returns> /// <returns>The generated number.</returns>
public static float Single(float minValue, float maxValue, int[] seeds) { public static float Single(float minValue, float maxValue, params int[] seeds) {
return (maxValue - minValue) * SingleRandom.Single(seeds) + minValue; return (maxValue - minValue) * SingleRandom.Single(seeds) + minValue;
} }
private static int Scramble(int[] seeds) { private static int Scramble(int[] seeds) {
if (seeds == null || seeds.Length <= 0) if (seeds == null || seeds.Length <= 0)
throw new ArgumentOutOfRangeException(nameof(seeds)); throw new ArgumentOutOfRangeException(nameof(seeds));
var ret = 1; var ret = 1623487;
for (var i = 0; i < seeds.Length; i++) for (var i = 0; i < seeds.Length; i++)
ret *= SingleRandom.Scramble(seeds[i]); ret += SingleRandom.ScrambleStep(seeds[i]) * 68659;
return ret; return ret;
} }
private static int Scramble(int seed) { private static int Scramble(int seed) {
return SingleRandom.ScrambleStep(seed) * 68659 + 1623487;
}
private static int ScrambleStep(int seed) {
seed ^= (seed << 7); seed ^= (seed << 7);
seed *= 207398809; seed *= 207398809;
seed ^= (seed << 17); seed ^= (seed << 17);

13
Tests/SingleRandomTests.cs
View file

@ -16,8 +16,8 @@ public class SingleRandomTests {
// test if all methods that accept mins and max are identical // test if all methods that accept mins and max are identical
Assert.AreEqual(SingleRandom.Int(i), SingleRandom.Int(int.MaxValue, i)); Assert.AreEqual(SingleRandom.Int(i), SingleRandom.Int(int.MaxValue, i));
Assert.AreEqual(SingleRandom.Int(i), SingleRandom.Int(0, int.MaxValue, i)); Assert.AreEqual(SingleRandom.Int(i), SingleRandom.Int(0, int.MaxValue, i));
Assert.AreEqual(SingleRandom.Single(i), SingleRandom.Single(1, i)); Assert.AreEqual(SingleRandom.Single(i), SingleRandom.Single(1F, i));
Assert.AreEqual(SingleRandom.Single(i), SingleRandom.Single(0, 1, i)); Assert.AreEqual(SingleRandom.Single(i), SingleRandom.Single(0F, 1F, i));
} }
} }
@ -25,8 +25,8 @@ public class SingleRandomTests {
public void TestBounds() { public void TestBounds() {
for (var i = 0; i < 1000000; i++) { for (var i = 0; i < 1000000; i++) {
Assert.That(SingleRandom.Single(i), Is.LessThan(1).And.GreaterThanOrEqualTo(0)); Assert.That(SingleRandom.Single(i), Is.LessThan(1).And.GreaterThanOrEqualTo(0));
Assert.That(SingleRandom.Single(127, i), Is.LessThan(127).And.GreaterThanOrEqualTo(0)); Assert.That(SingleRandom.Single(127F, i), Is.LessThan(127).And.GreaterThanOrEqualTo(0));
Assert.That(SingleRandom.Single(12920, 1203919023, i), Is.LessThan(1203919023).And.GreaterThanOrEqualTo(12920)); Assert.That(SingleRandom.Single(12920F, 1203919023F, i), Is.LessThan(1203919023).And.GreaterThanOrEqualTo(12920));
Assert.That(SingleRandom.Int(i), Is.LessThan(int.MaxValue).And.GreaterThanOrEqualTo(0)); Assert.That(SingleRandom.Int(i), Is.LessThan(int.MaxValue).And.GreaterThanOrEqualTo(0));
Assert.That(SingleRandom.Int(17, i), Is.LessThan(17).And.GreaterThanOrEqualTo(0)); Assert.That(SingleRandom.Int(17, i), Is.LessThan(17).And.GreaterThanOrEqualTo(0));
@ -42,9 +42,8 @@ public class SingleRandomTests {
ints.Add(SingleRandom.Int(i)); ints.Add(SingleRandom.Int(i));
flts.Add(SingleRandom.Single(i)); flts.Add(SingleRandom.Single(i));
} }
// allow being off by 0.00001 of the total Assert.AreEqual(0.5, ints.Average() / int.MaxValue, 0.001);
Assert.AreEqual(ints.Average(), int.MaxValue / 2, 0.00001 * int.MaxValue); Assert.AreEqual(0.5, flts.Average(), 0.001);
Assert.AreEqual(flts.Average(), 0.5, 0.00001);
} }
} }