Changed implementation of ProbabilitiesMatter to call PickOne() and a…

…lso Pick(n). This made 1 test redundant.
ndsvw · Mar 16, 2024 · d9b3ced · d9b3ced
1 parent 5b71913
commit d9b3ced
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 31 deletions.
diff --git a/FluentRandomPicker.Tests/PrioritizedElementsTests.cs b/FluentRandomPicker.Tests/PrioritizedElementsTests.cs
@@ -44,27 +44,6 @@ public void Weight3ValuesWith3DifferentWeights_WeightsMatter()
         Assert.That.ProbabilitiesMatter(pickable, valueChancesPairs: valueChancesPairs);
     }
 
-    [TestMethod]
-    public void Weight3ValuesWith3DifferentWeights_PickN_WeightsMatter()
-    {
-        var elements = new PrioritizedElement<char>[]
-        {
-            new PrioritizedElement<char> {Value = 'a', Priority = 7},
-            new PrioritizedElement<char> {Value = 'b', Priority = 2},
-            new PrioritizedElement<char> {Value = 'c', Priority = 1},
-        };
-
-        var pickable = Out.Of()
-            .PrioritizedElements(elements)
-            .WithValueSelector(x => x.Value)
-            .AndWeightSelector(x => x.Priority);
-
-        var valueChancesPairs = new[] { ('a', 0.7), ('b', 0.2), ('c', 0.1) };
-
-        Assert.That.PickNProbabilitiesMatter(pickable, valueChancesPairs: valueChancesPairs);
-    }
-
-
     [TestMethod]
     public void Percentage3ValuesWith3DifferentPercentages_PercentagesMatter()
     {

diff --git a/FluentRandomPicker.Tests/TestUtils.cs b/FluentRandomPicker.Tests/TestUtils.cs
@@ -25,6 +25,13 @@ public static void AssertAllSpecifiedValuesAndNoOthersArePossible<T>(Func<T> pic
 
     public static void ProbabilitiesMatter<T>(this Assert assert, IPick<T> pickable,
         int tries = 1_000_000, double acceptedDeviation = 0.25, params (T value, double chance)[] valueChancesPairs)
+    {
+        Assert.That.PickOneProbabilitiesMatter(pickable, tries, acceptedDeviation, valueChancesPairs);
+        Assert.That.PickNProbabilitiesMatter(pickable, tries, acceptedDeviation, valueChancesPairs);
+    }
+
+    private static void PickOneProbabilitiesMatter<T>(this Assert assert, IPick<T> pickable,
+        int tries = 1_000_000, double acceptedDeviation = 0.25, params (T value, double chance)[] valueChancesPairs)
     {
         var occurrences = new Dictionary<T, long>();
 
@@ -37,29 +44,27 @@ public static void ProbabilitiesMatter<T>(this Assert assert, IPick<T> pickable,
                 occurrences.Add(value, 1);
         }
 
-        foreach(var (value, chance) in valueChancesPairs)
-        {
-            if (chance == 0 && !occurrences.ContainsKey(value))
-                continue;
-
-            Assert.IsTrue(occurrences[value] >= tries * chance * (1 - acceptedDeviation));
-            Assert.IsTrue(occurrences[value] <= tries * chance * (1 + acceptedDeviation));
-        }
+        Assert.That.EvaluateOccurrences(occurrences, tries, acceptedDeviation, valueChancesPairs);
     }
 
-    public static void PickNProbabilitiesMatter<T>(this Assert _, IPick<T> pickable, int tries = 1_000_000,
+    private static void PickNProbabilitiesMatter<T>(this Assert _, IPick<T> pickable, int tries = 1_000_000,
         double acceptedDeviation = 0.25, params (T value, double chance)[] valueChancesPairs)
     {
         var occurrences = new Dictionary<T, long>(valueChancesPairs.Length);
 
-        foreach (T value in pickable.Pick(tries))
+        foreach (var value in pickable.Pick(tries))
         {
             if (occurrences.ContainsKey(value))
                 occurrences[value]++;
             else
                 occurrences.Add(value, 1);
         }
 
+        Assert.That.EvaluateOccurrences(occurrences, tries, acceptedDeviation, valueChancesPairs);
+    }
+
+    private static void EvaluateOccurrences<T>(this Assert _, Dictionary<T, long> occurrences, int tries, double acceptedDeviation, params (T value, double chance)[] valueChancesPairs)
+    {
         foreach(var (value, chance) in valueChancesPairs)
         {
             if (chance == 0 && !occurrences.ContainsKey(value))