Extracted a GameStateViewModel

Author: IntegerMan

MattEland.FSharpGeneticAlgorithm.WindowsClient/MainWindow.xaml

@@ -15,7 +15,7 @@
     </Window.Resources>
     <DockPanel>
         <!-- Status Bar -->
-        <StatusBar DockPanel.Dock="Bottom" Background="{Binding GameStatusBrush}" FontWeight="Bold">
+        <StatusBar DockPanel.Dock="Bottom" DataContext="{Binding State}" Background="{Binding GameStatusBrush}" FontWeight="Bold">
             <StatusBarItem>
                 <TextBlock Text="{Binding TurnsLeftText}"></TextBlock>
             </StatusBarItem>
@@ -33,7 +33,7 @@
             </StackPanel>
         </Border>
         <!-- Main UI -->
-        <Grid Margin="10" Background="Green">
+        <Grid Margin="10" Background="Green" DataContext="{Binding State}">
             <Image Source="Images/Grass.png" Stretch="Fill" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"></Image>
             <Viewbox Stretch="Uniform">
                 <Border BorderThickness="1" BorderBrush="DarkGreen">

MattEland.FSharpGeneticAlgorithm.WindowsClient/ViewModels/ActorViewModel.cs

@@ -2,7 +2,7 @@
 
 namespace MattEland.FSharpGeneticAlgorithm.WindowsClient.ViewModels
 {
-    internal class ActorViewModel
+    public class ActorViewModel
     {
         private readonly Actors.Actor _actor;
 

MattEland.FSharpGeneticAlgorithm.WindowsClient/ViewModels/GameStateViewModel.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Media;
+using JetBrains.Annotations;
+using MattEland.FSharpGeneticAlgorithm.Logic;
+
+namespace MattEland.FSharpGeneticAlgorithm.WindowsClient.ViewModels
+{
+    /// <summary>
+    /// Represents a single state in a single squirrel's simulation run
+    /// </summary>
+    public class GameStateViewModel : NotifyPropertyChangedBase
+    {
+        private readonly Simulator.GameState _state;
+
+        public GameStateViewModel([NotNull] Simulator.GameState state)
+        {
+            _state = state ?? throw new ArgumentNullException(nameof(state));
+
+            foreach (var actor in _state.World.Actors.Where(a => a.IsActive))
+            {
+                Actors.Add(new ActorViewModel(actor));
+            }
+        }
+
+        public ICollection<ActorViewModel> Actors { get; } = new List<ActorViewModel>();
+
+        public string GameStatusText => _state.SimState switch
+        {
+            Simulator.SimulationState.Won => "Won",
+            Simulator.SimulationState.Lost => "Lost",
+            _ => "Simulating"
+        };
+
+        public Brush GameStatusBrush => _state.SimState switch
+        {
+            Simulator.SimulationState.Won => Brushes.MediumSeaGreen,
+            Simulator.SimulationState.Lost => Brushes.LightCoral,
+            _ => Brushes.LightGray
+        };
+
+        public string TurnsLeftText => _state.TurnsLeft == 1
+            ? "1 Turn Left"
+            : $"{_state.TurnsLeft} Turns Left";
+    }
+}

MattEland.FSharpGeneticAlgorithm.WindowsClient/ViewModels/MainViewModel.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Windows.Media;
 using MattEland.FSharpGeneticAlgorithm.Genetics;
 using MattEland.FSharpGeneticAlgorithm.Logic;
 
@@ -34,8 +31,6 @@ public BrainInfoViewModel Brain
 
         public ActionCommand RandomizeCommand { get; }
 
-        public IEnumerable<ActorViewModel> Actors => _actors;
-
         private void RandomizeBrain()
         {
             Brain = new BrainInfoViewModel(Genes.getRandomChromosome(_random));
@@ -56,43 +51,25 @@ public Simulator.GameState[] GameResult
 
                 _gameResult = value;
 
-                State = value.Last();
-
-                _actors.Clear();
-                foreach (var actor in State.World.Actors.Where(a => a.IsActive))
-                {
-                    _actors.Add(new ActorViewModel(actor));
-                }
-
-                // Notify all properties changed
-                OnPropertyChanged(string.Empty);
+                State = new GameStateViewModel(value.Last());
             }
         }
 
         public ActionCommand BrainCommand { get; }
 
-        private readonly ObservableCollection<ActorViewModel> _actors = new ObservableCollection<ActorViewModel>();
         private BrainInfoViewModel _brain;
         private Simulator.GameState[] _gameResult;
+        private GameStateViewModel _state;
 
-        public Simulator.GameState State { get; private set; }
-
-        public string GameStatusText => State.SimState switch
-            {
-                Simulator.SimulationState.Won => "Won",
-                Simulator.SimulationState.Lost => "Lost",
-                _ => "Simulating"
-            };
-
-        public Brush GameStatusBrush => State.SimState switch
+        public GameStateViewModel State
+        {
+            get => _state;
+            private set
             {
-                Simulator.SimulationState.Won => Brushes.MediumSeaGreen,
-                Simulator.SimulationState.Lost => Brushes.LightCoral,
-                _ => Brushes.LightGray
-            };
-
-        public string TurnsLeftText => State.TurnsLeft == 1 
-                ? "1 Turn Left" 
-                : $"{State.TurnsLeft} Turns Left";
+                if (Equals(value, _state)) return;
+                _state = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

MattEland.FSharpGeneticAlgorithm.WindowsClient/ViewModels/NotifyPropertyChangedBase.cs

@@ -4,7 +4,7 @@
 
 namespace MattEland.FSharpGeneticAlgorithm.WindowsClient.ViewModels
 {
-    internal abstract class NotifyPropertyChangedBase : INotifyPropertyChanged
+    public abstract class NotifyPropertyChangedBase : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;