Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make RandomE support IReadOnlyList
  • Loading branch information
bluexo committed Dec 15, 2020
commit cf89f0f94672269f1eb67115446846732e7d849f
20 changes: 15 additions & 5 deletions Runtime/RandomE.cs
Original file line number Diff line number Diff line change
Expand Up @@ -323,17 +323,27 @@ public static List<ColorHSV> TetradicPalette(float saturation = 1, float value =
/// <summary>
/// Returns a random element
/// </summary>
public static T GetRandom<T>(this IList<T> list)
private static T GetRandomInternal<T>(this IEnumerable<T> list)
{
if (list == null)
{
throw new ArgumentNullException(nameof(list));
}
if (list.Count == 0)
if (list.Count() == 0)
{
throw new ArgumentException("Empty list");
}
return list[URandom.Range(0, list.Count)];
return list.ElementAt(URandom.Range(0, list.Count()));
}

public static T GetRandom<T>(this IList<T> list)
{
return GetRandomInternal(list);
}

public static T GetReadOnlyRandom<T>(this IReadOnlyList<T> list)
{
return GetRandomInternal(list);
}

/// <summary>
Expand Down Expand Up @@ -370,12 +380,12 @@ public static TValue GetRandom<TKey, TValue>(this Dictionary<TKey, TValue> dicti
return dictionary[new List<TKey>(keys).GetRandom()];
}

public static T GetRandom<T>(this IReadOnlyList<T> list, IReadOnlyList<float> weights)
public static T GetReadOnlyRandom<T>(this IReadOnlyList<T> list, IReadOnlyList<float> weights)
{
return GetRandomInternal(list, weights);
}

public static T GetRandom<T>(this IReadOnlyList<T> list, IList<float> weights)
public static T GetReadOnlyRandom<T>(this IReadOnlyList<T> list, IList<float> weights)
{
return GetRandomInternal(list, weights);
}
Expand Down