Introduced SimulationResult, switching to tupled functions.

Author: IntegerMan

MattEland.FSharpGeneticAlgorithm.Logic/Simulator.fs

@@ -136,15 +136,21 @@ let buildStartingState (random: System.Random): GameState =
   let world = makeWorld 13 13 random.Next
   { World = world; SimState = SimulationState.Simulating; TurnsLeft = 30}
 
-let simulateGame (initialState: GameState, random: System.Random, brain: ActorChromosome): GameState[] =
+type SimulationResult = {
+    score: float
+    states: GameState[]
+  }
+
+let simulateGame random brain initialState =
   let states = ResizeArray<GameState>()
   states.Add(initialState)
   let mutable currentState = initialState
   while currentState.SimState = SimulationState.Simulating do
     currentState <- handleChromosomeMove(currentState, random, brain)
     states.Add(currentState)
-  states.ToArray()
+  {
+    score = 0.0; // TODO: Actually score
+    states = states.ToArray()
+  }
 
-let simulate (random: System.Random, brain: ActorChromosome): GameState[] =
-  let state = buildStartingState random
-  simulateGame(state, random, brain)
+let simulate random brain = buildStartingState random |> simulateGame random brain

MattEland.FSharpGeneticAlgorithm.WindowsClient/ViewModels/SimulationResultViewModel.cs

@@ -6,18 +6,23 @@ namespace MattEland.FSharpGeneticAlgorithm.WindowsClient.ViewModels
 {
     public class SimulationResultViewModel : NotifyPropertyChangedBase
     {
+        private readonly Simulator.SimulationResult _result;
         private readonly ObservableCollection<GameStateViewModel> _states;
         private int _currentIndex;
 
-        public SimulationResultViewModel(IEnumerable<Simulator.GameState> states)
+        public SimulationResultViewModel(Simulator.SimulationResult result)
         {
+            _result = result;
             _states = new ObservableCollection<GameStateViewModel>();
-            foreach (var state in states)
+            foreach (var state in _result.states)
             {
                 _states.Add(new GameStateViewModel(state));
             }
         }
 
+        public double Score => _result.score;
+        public string ScoreText => $"Score: {Score:F1}";
+
         public IEnumerable<GameStateViewModel> States => _states; 
 
         public GameStateViewModel SelectedState => _states[CurrentIndex];