Each evaluator should return a single slot result

all3bar · Feb 27, 2017 · 52b5176 · 52b5176
1 parent b8493b3
commit 52b5176
Show file tree

Hide file tree

Showing 14 changed files with 195 additions and 227 deletions.
diff --git a/GDK/Assets/Components/GameSimulation/Scripts/SimulationController.cs b/GDK/Assets/Components/GameSimulation/Scripts/SimulationController.cs
@@ -83,9 +83,9 @@ private void Simulate()
 
                 ReelWindow reelWindow = new ReelWindow(paytable.ReelGroup, randomNumbers);
 
-                SlotResults results = evaluator.Evaluate(paytable, reelWindow, rng);
+                SlotResult result = evaluator.Evaluate(paytable, reelWindow, rng);
 
-                totalWin += results.TotalWin;
+                totalWin += result.TotalWin;
 
                 Progress = (float)currentSimulation / (float)modelData.NumberOfSimulations;
                 currentSimulation++;

diff --git a/GDK/Assets/Components/MathEngine/Evaluators/AnywayEvaluator.cs b/GDK/Assets/Components/MathEngine/Evaluators/AnywayEvaluator.cs
@@ -5,7 +5,7 @@ namespace GDK.MathEngine.Evaluators
 {
 	public class AnywaysEvaluator : IEvaluator
 	{
-		public SlotResults Evaluate (Paytable paytable, ReelWindow reelWindow, IRng rng)
+		public SlotResult Evaluate (Paytable paytable, ReelWindow reelWindow, IRng rng)
 		{
 			throw new System.NotImplementedException ();
 		}

diff --git a/GDK/Assets/Components/MathEngine/Evaluators/IEvaluator.cs b/GDK/Assets/Components/MathEngine/Evaluators/IEvaluator.cs
@@ -13,6 +13,6 @@ namespace GDK.MathEngine.Evaluators
 	/// </remarks>
 	public interface IEvaluator
 	{
-		SlotResults Evaluate (Paytable paytable, ReelWindow reelWindow, IRng rng);
+		SlotResult Evaluate (Paytable paytable, ReelWindow reelWindow, IRng rng);
 	}
 }
diff --git a/GDK/Assets/Components/MathEngine/Evaluators/PaylineEvaluator.cs b/GDK/Assets/Components/MathEngine/Evaluators/PaylineEvaluator.cs
@@ -10,11 +10,9 @@ public class PaylineEvaluator : IEvaluator
     {
         private ReelWindow reelWindow;
 
-        public SlotResults Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
+        public SlotResult Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
         {
-            // TODO: Each evaluator should add to this rather than creating a new one.
-            SlotResults results = new SlotResults();
-
+            SlotResult result = new SlotResult();
             PaylinesComponent component = new PaylinesComponent();
 
             // Iterate through each payline defined in the paytable.
@@ -46,18 +44,16 @@ public SlotResults Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
                 if (bestPayCombo != null)
                 {
                     component.PayResults.Add(new PayResult { PayCombo = bestPayCombo, Payline = payline });
-                    results.TotalWin += bestPayCombo.PayAmount;
+                    result.TotalWin += bestPayCombo.PayAmount;
                 }
             }
 
-            SlotResult slotResult = new SlotResult();
-            results.Results.Add(slotResult);
             if (component.PayResults.Count > 0)
             {
-                slotResult.AddComponent<PaylinesComponent>(component);
+                result.AddComponent<PaylinesComponent>(component);
             }
 
-            return results;
+            return result;
         }
     }
 }
diff --git a/GDK/Assets/Components/MathEngine/Evaluators/PaytableEvaluator.cs b/GDK/Assets/Components/MathEngine/Evaluators/PaytableEvaluator.cs
@@ -18,7 +18,7 @@ public class PaytableEvaluator : IEvaluator
 	{
 		private IRng rng;
 
-        public SlotResults Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
+        public SlotResult Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
 		{
 			//PaylineEvaluator paylineEvaluator = new PaylineEvaluator ();
 			//ScatterEvaluator scatterEvaluator = new ScatterEvaluator ();

diff --git a/GDK/Assets/Components/MathEngine/Evaluators/PickEvaluator.cs b/GDK/Assets/Components/MathEngine/Evaluators/PickEvaluator.cs
@@ -12,7 +12,7 @@ public PickEvaluator (string pickFeatureId)
 			PickFeatureId = pickFeatureId;
 		}
 
-        public SlotResults Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
+        public SlotResult Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
 		{
 			if (paytable.PickTableGroup.PickTable.ContainsKey (PickFeatureId) == false)
 			{
@@ -26,7 +26,6 @@ public SlotResults Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
 			List<PickItem> pickItems = new List<PickItem> (pickTable.PickItemList);
 
 			PickItem item;
-			SlotResults results = new SlotResults ();
             PickComponent component = new PickComponent();
 
 			do
@@ -46,11 +45,10 @@ public SlotResults Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
 
             // Add the pick component to the slot result.
             SlotResult slotResult = new SlotResult();
-            results.Results.Add(slotResult);
             if (component.PickResults.Count > 0)
                 slotResult.AddComponent<PickComponent>(component);
-				
-			return results;
+
+            return slotResult;
 		}
 	}
 }
diff --git a/GDK/Assets/Components/MathEngine/Evaluators/ScatterEvaluator.cs b/GDK/Assets/Components/MathEngine/Evaluators/ScatterEvaluator.cs
@@ -4,57 +4,57 @@
 
 namespace GDK.MathEngine.Evaluators
 {
-	public class ScatterEvaluator : IEvaluator
-	{
-		private ReelWindow reelWindow;
-
-		public SlotResults Evaluate (Paytable paytable, ReelWindow reelWindow, IRng rng)
-		{
-			SlotResults results = new SlotResults ();
+    public class ScatterEvaluator : IEvaluator
+    {
+        private ReelWindow reelWindow;
 
+        public SlotResult Evaluate(Paytable paytable, ReelWindow reelWindow, IRng rng)
+        {
+            SlotResult result = new SlotResult();
             ScattersComponent component = new ScattersComponent();
-			 
-			List<PayCombo> payCombos = paytable.ScatterComboGroup.Combos;
-			for (int combo = 0; combo < payCombos.Count; ++combo)
-			{
-				PayCombo payCombo = payCombos [combo];
-				int bestPayAmount = 0;
-				PayCombo bestPayCombo = null;
-
-				// TODO: This assumes the scatter combo contains one type of symbol only.
-				// In almost all cases, this will be true so leaving it for now.
-				bool match = false;
-				Symbol symbol = payCombo.SymbolsInPayCombo[0];
-				if (reelWindow.SymbolPositions.ContainsKey (symbol) &&
+
+            List<PayCombo> payCombos = paytable.ScatterComboGroup.Combos;
+            for (int combo = 0; combo < payCombos.Count; ++combo)
+            {
+                PayCombo payCombo = payCombos[combo];
+                int bestPayAmount = 0;
+                PayCombo bestPayCombo = null;
+
+                // TODO: This assumes the scatter combo contains one type of symbol only.
+                // In almost all cases, this will be true so leaving it for now.
+                bool match = false;
+                Symbol symbol = payCombo.SymbolsInPayCombo[0];
+                if (reelWindow.SymbolPositions.ContainsKey(symbol) &&
                     reelWindow.SymbolPositions[symbol].Count >= payCombo.SymbolsInPayCombo.Count)
-				{
-					match = true;
-				}
-					
-				if (match && (payCombo.PayAmount >= bestPayAmount))
-				{
-					bestPayCombo = payCombo;
-					bestPayAmount = payCombo.PayAmount;
-				}
-
-				if (bestPayCombo != null)
-				{
+                {
+                    match = true;
+                }
+
+                if (match && (payCombo.PayAmount >= bestPayAmount))
+                {
+                    bestPayCombo = payCombo;
+                    bestPayAmount = payCombo.PayAmount;
+                }
+
+                if (bestPayCombo != null)
+                {
                     // TODO: Might be able to optimize this but making PaylineCoord and SymbolPosition the same thing...
                     Payline payline = new Payline();
                     foreach (var position in reelWindow.SymbolPositions[symbol])
                     {
                         payline.AddPaylineCoord(new PaylineCoord { ReelIndex = position.ReelIndex, Offset = position.ReelOffset });
                     }
                     component.PayResults.Add(new PayResult { PayCombo = bestPayCombo, Payline = payline });
-				}
-			}
+                    result.TotalWin += bestPayCombo.PayAmount;
+                }
+            }
 
-            SlotResult slotResult = new SlotResult();
-            results.Results.Add(slotResult);
             if (component.PayResults.Count > 0)
-                slotResult.AddComponent<ScattersComponent>(component);
+            {
+                result.AddComponent<ScattersComponent>(component);
+            }
 
-			return results;
-		}
-	}
+            return result;
+        }
+    }
 }
diff --git a/GDK/Assets/Components/MathEngine/SlotResult.cs b/GDK/Assets/Components/MathEngine/SlotResult.cs
@@ -52,6 +52,8 @@ public class SlotResult
     {
         private List<IComponent> components { get; set; }
 
+        public int TotalWin { get; set; }
+
         public SlotResult()
         {
             components = new List<IComponent>();