Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-12-25 09:49:23 +01:00
Code Issues Projects Releases Wiki Activity

added some more Add overloads to SeedSource

Browse source
This commit is contained in:
Ell 2022-12-04 22:43:25 +01:00
parent 943616e21a
commit cf3d0e8e0c
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
MLEM/Misc/SeedSource.cs
View file

@ -12,23 +12,6 @@ namespace MLEM.Misc {
private readonly int? value;
/// <summary>
/// Creates a new seed source from the given seed, which will be added automatically using <see cref="Add(int)"/>.
/// </summary>
/// <param name="seed">The initial seed to use.</param>
public SeedSource(int seed) : this() {
this = this.Add(seed);
}
/// <summary>
/// Creates a new seed source from the given set of seeds, which will be added automatically using <see cref="Add(int)"/>.
/// </summary>
/// <param name="seeds">The initial seeds to use.</param>
public SeedSource(params int[] seeds) : this() {
foreach (var seed in seeds)
this = this.Add(seed);
}
private SeedSource(int? value) {
this.value = value;
}
@ -40,7 +23,7 @@ namespace MLEM.Misc {
/// <param name="seed">The seed to add.</param>
/// <returns>A new seed source with the seed added.</returns>
public SeedSource Add(int seed) {
return new SeedSource(new int?(SeedSource.Scramble(this.Get()) + SeedSource.Scramble(seed)));
return new SeedSource(SeedSource.Scramble(this.Get()) + SeedSource.Scramble(seed));
}
/// <summary>
@ -66,13 +49,36 @@ namespace MLEM.Misc {
return ret;
}
/// <summary>
/// Adds the given seed to this seed source's value and returns the result as a new seed source.
/// Guids are scrambled by invoking <see cref="Add(int)"/> using every byte in the <see cref="Guid"/>'s byte array.
/// </summary>
/// <param name="seed">The seed to add.</param>
/// <returns>A new seed source with the seed added.</returns>
public SeedSource Add(Guid seed) {
var ret = this;
foreach (var b in seed.ToByteArray())
ret = ret.Add(b);
return ret;
}
/// <summary>
/// Adds the given seed to this seed source's value and returns the result as a new seed source.
/// Any objects that don't have a specially defined <see cref="Add(int)"/> overload get scrambled using <see cref="object.GetHashCode"/>.
/// </summary>
/// <param name="seed">The seed to add.</param>
/// <returns>A new seed source with the seed added.</returns>
public SeedSource Add(object seed) {
return this.Add(seed?.GetHashCode() ?? 0);
}
/// <summary>
/// Returns a new seed source whose value is this seed source's value, but scrambled further.
/// In essence, this creates a new seed source whose value is determined by the current seed source.
/// </summary>
/// <returns>A new seed source with a rotated value.</returns>
public SeedSource Rotate() {
return new SeedSource(new int?(SeedSource.Scramble(this.Get())));
return new SeedSource(SeedSource.Scramble(this.Get()));
}
/// <summary>

2
MLEM/Misc/SingleRandom.cs
View file

@ -79,7 +79,7 @@
/// <param name="seed">The seed to use.</param>
/// <returns>The generated number.</returns>
public static float Single(int seed) {
return (new SeedSource(seed).Get() / (float) int.MaxValue + 1) / 2;
return (new SeedSource().Add(seed).Get() / (float) int.MaxValue + 1) / 2;
}
/// <summary>

2
Tests/SingleRandomTests.cs
View file

@ -13,9 +13,7 @@ public class SingleRandomTests {
public void TestEquality() {
for (var i = 0; i < 1000000; i++) {
Assert.AreEqual(SingleRandom.Single(i), SingleRandom.Single(new SeedSource().Add(i)));
Assert.AreEqual(SingleRandom.Single(i), SingleRandom.Single(new SeedSource(i)));
Assert.AreEqual(SingleRandom.Int(i), SingleRandom.Int(new SeedSource().Add(i)));
Assert.AreEqual(SingleRandom.Int(i), SingleRandom.Int(new SeedSource(i)));
// test if all methods that accept mins and max are identical
Assert.AreEqual(SingleRandom.Int(i), SingleRandom.Int(int.MaxValue, i));