Final code from Article 5

Author: IntegerMan

MattEland.FSharpGeneticAlgorithm.Logic/Genetics.fs

@@ -4,25 +4,25 @@
   open MattEland.FSharpGeneticAlgorithm.Logic.Actors
   open MattEland.FSharpGeneticAlgorithm.Logic.World
 
-  type SquirrelPriorities =
+  type ActorChromosome =
     {
       dogImportance: double
       acornImportance: double
       rabbitImportance: double
       treeImportance: double
-      selfImportance: double
+      squirrelImportance: double
       randomImportance: double
     }
 
   let getRandomGene (random: System.Random): double = (random.NextDouble() * 2.0) - 1.0
 
-  let getRandomPriorities (random: System.Random) = 
+  let getRandomChromosome (random: System.Random) = 
     {
       dogImportance = getRandomGene random;
       acornImportance = getRandomGene random;
       rabbitImportance = getRandomGene random;
       treeImportance = getRandomGene random;
-      selfImportance = getRandomGene random;
+      squirrelImportance = getRandomGene random;
       randomImportance = getRandomGene random;
     }
 
@@ -32,8 +32,8 @@
     else
       0.0
 
-  let evaluateTile(brain: SquirrelPriorities, world: World, pos: WorldPos, random: System.Random): float =
-    evaluateProximity(world.Squirrel, pos, brain.selfImportance) + 
+  let evaluateTile(brain: ActorChromosome, world: World, pos: WorldPos, random: System.Random): float =
+    evaluateProximity(world.Squirrel, pos, brain.squirrelImportance) + 
     evaluateProximity(world.Rabbit, pos, brain.rabbitImportance) + 
     evaluateProximity(world.Doggo, pos, brain.dogImportance) + 
     evaluateProximity(world.Acorn, pos, brain.acornImportance) + 

MattEland.FSharpGeneticAlgorithm.Logic/Simulator.fs

@@ -115,22 +115,18 @@ let decreaseTimer (state: GameState) =
   else
     state
 
-let simulateActors (state: GameState) getRandomNumber =
+let simulateActors (state: GameState, getRandomNumber) =
   moveRandomly state state.World.Rabbit getRandomNumber 
   |> simulateDoggo
   |> decreaseTimer
 
-let handleBrainMove brain state (random: System.Random) =
+let handleChromosomeMove (state: GameState, random: System.Random, chromosome: ActorChromosome) =
   if state.SimState = SimulationState.Simulating then
     let current = state.World.Squirrel.Pos
     let movedPos = getCandidates(current, state.World, true) 
-                   |> Seq.sortBy(fun pos -> evaluateTile(brain, state.World, pos, random))
+                   |> Seq.sortBy(fun pos -> evaluateTile(chromosome, state.World, pos, random))
                    |> Seq.head
     let newState = moveActor state state.World.Squirrel movedPos
-    simulateActors(newState) random.Next
+    simulateActors(newState, random.Next)
   else
-    state
-
-let simulateAiTurn state (random: System.Random) brain =
-  let newState = handleBrainMove brain state random
-  simulateActors(newState) random.Next  
+    state

MattEland.FSharpGeneticAlgorithm.Tests/Tests.fs

@@ -29,7 +29,7 @@ let ``Rabbit should move randomly`` () =
   let originalPos = state.World.Rabbit.Pos
 
   // Act
-  let newWorld = simulateActors state getRandomNumber
+  let newWorld = simulateActors(state, getRandomNumber)
 
   // Assert
   newWorld.World.Rabbit.Pos |> should not' (equal originalPos)
@@ -42,7 +42,7 @@ let ``Dog Should Eat Squirrel If Adjacent`` () =
   let state: GameState = {testState with World = {testState.World with Squirrel = customSquirrel}}
 
   // Act
-  let newState = simulateActors state getRandomNumber
+  let newState = simulateActors(state, getRandomNumber)
 
   // Assert
   newState.World.Doggo.Pos |> should equal newState.World.Squirrel.Pos
@@ -55,7 +55,7 @@ let ``Simulating actors should decrease the turns left counter`` () =
   let initialState = buildTestState
 
   // Act
-  let newState = simulateActors initialState getRandomNumber
+  let newState = simulateActors(initialState, getRandomNumber)
 
   // Assert
   newState.TurnsLeft |> should equal (initialState.TurnsLeft - 1)
@@ -66,7 +66,7 @@ let ``Running out of turns should lose the simulation`` () =
   let state: GameState = {buildTestState with TurnsLeft = 0}
 
   // Act
-  let newState = simulateActors state getRandomNumber
+  let newState = simulateActors(state, getRandomNumber)
 
   // Assert
   newState.SimState |> should equal SimulationState.Lost

MattEland.FSharpGeneticAlgorithm.WindowsClient/BrainInfoControl.xaml

@@ -7,17 +7,19 @@
              mc:Ignorable="d" 
              d:DataContext="{d:DesignInstance viewModels:BrainInfoViewModel}">
     <StackPanel>
+        <TextBlock Margin="0,10,0,10" FontWeight="Bold">Brain Info:</TextBlock>
+
+        <TextBlock Margin="0,10,0,0">Acorn</TextBlock>
+        <ProgressBar Minimum="-1" Maximum="1" Value="{Binding AcornPriority, Mode=OneWay}"></ProgressBar>
         <TextBlock Margin="0,10,0,0">Dog</TextBlock>
         <ProgressBar Minimum="-1" Maximum="1" Value="{Binding DoggoPriority, Mode=OneWay}"></ProgressBar>
         <TextBlock Margin="0,10,0,0">Rabbit</TextBlock>
         <ProgressBar Minimum="-1" Maximum="1" Value="{Binding RabbitPriority, Mode=OneWay}"></ProgressBar>
-        <TextBlock Margin="0,10,0,0">Acorn</TextBlock>
-        <ProgressBar Minimum="-1" Maximum="1" Value="{Binding AcornPriority, Mode=OneWay}"></ProgressBar>
+        <TextBlock Margin="0,10,0,0">Squirrel</TextBlock>
+        <ProgressBar Minimum="-1" Maximum="1" Value="{Binding SquirrelPriority, Mode=OneWay}"></ProgressBar>
         <TextBlock Margin="0,10,0,0">Tree</TextBlock>
         <ProgressBar Minimum="-1" Maximum="1" Value="{Binding TreePriority, Mode=OneWay}"></ProgressBar>
         <TextBlock Margin="0,10,0,0">Random</TextBlock>
         <ProgressBar Minimum="-1" Maximum="1" Value="{Binding RandomPriority, Mode=OneWay}"></ProgressBar>
-        <TextBlock Margin="0,10,0,0">Squirrel</TextBlock>
-        <ProgressBar Minimum="-1" Maximum="1" Value="{Binding SquirrelPriority, Mode=OneWay}"></ProgressBar>
     </StackPanel>
 </UserControl>

MattEland.FSharpGeneticAlgorithm.WindowsClient/BrainInfoControl.xaml.cs

@@ -1,22 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace MattEland.FSharpGeneticAlgorithm.WindowsClient
+namespace MattEland.FSharpGeneticAlgorithm.WindowsClient
 {
     /// <summary>
     /// Interaction logic for BrainInfoControl.xaml
     /// </summary>
-    public partial class BrainInfoControl : UserControl
+    public partial class BrainInfoControl
     {
         public BrainInfoControl()
         {

MattEland.FSharpGeneticAlgorithm.WindowsClient/MainWindow.xaml

@@ -30,7 +30,6 @@
                 <Button Style="{StaticResource CommandButtonStyle}" Command="{Binding RandomizeCommand}">Randomize Brain</Button>
                 <Button Style="{StaticResource CommandButtonStyle}" Command="{Binding ResetCommand}">Restart</Button>
 
-                <TextBlock Margin="0,10,0,10" FontWeight="Bold">Brain Info:</TextBlock>
                 <windowsClient:BrainInfoControl DataContext="{Binding Brain}"></windowsClient:BrainInfoControl>
             </StackPanel>
         </Border>

MattEland.FSharpGeneticAlgorithm.WindowsClient/MainWindow.xaml.cs

@@ -1,5 +1,4 @@
-using System.Windows;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using MattEland.FSharpGeneticAlgorithm.WindowsClient.ViewModels;
 
 namespace MattEland.FSharpGeneticAlgorithm.WindowsClient

MattEland.FSharpGeneticAlgorithm.WindowsClient/ViewModels/BrainInfoViewModel.cs

@@ -6,19 +6,17 @@ namespace MattEland.FSharpGeneticAlgorithm.WindowsClient.ViewModels
 {
     public class BrainInfoViewModel
     {
-        private readonly Genes.SquirrelPriorities _brain;
-
-        public BrainInfoViewModel([NotNull] Genes.SquirrelPriorities brain)
+        public BrainInfoViewModel([NotNull] Genes.ActorChromosome brain)
         {
-            _brain = brain ?? throw new ArgumentNullException(nameof(brain));
+            Model = brain ?? throw new ArgumentNullException(nameof(brain));
         }
 
-        public double SquirrelPriority => _brain.selfImportance;
-        public double DoggoPriority => _brain.dogImportance;
-        public double RabbitPriority => _brain.rabbitImportance;
-        public double AcornPriority => _brain.acornImportance;
-        public double TreePriority => _brain.treeImportance;
-        public double RandomPriority => _brain.randomImportance;
-        public Genes.SquirrelPriorities Model => _brain;
+        public double SquirrelPriority => Model.squirrelImportance;
+        public double DoggoPriority => Model.dogImportance;
+        public double RabbitPriority => Model.rabbitImportance;
+        public double AcornPriority => Model.acornImportance;
+        public double TreePriority => Model.treeImportance;
+        public double RandomPriority => Model.randomImportance;
+        public Genes.ActorChromosome Model { get; }
     }
 }

MattEland.FSharpGeneticAlgorithm.WindowsClient/ViewModels/MainViewModel.cs

@@ -41,10 +41,10 @@ public BrainInfoViewModel Brain
         public IEnumerable<ActorViewModel> Actors => _actors;
 
         private void RandomizeBrain() =>
-            Brain = new BrainInfoViewModel(Genes.getRandomPriorities(_random));
+            Brain = new BrainInfoViewModel(Genes.getRandomChromosome(_random));
 
         private void GetArtificialIntelligenceMove() => 
-            State = Simulator.handleBrainMove(Brain.Model, _state, _random);
+            State = Simulator.handleChromosomeMove(_state, _random, Brain.Model);
 
         public ActionCommand ResetCommand { get; }
         public ActionCommand BrainCommand { get; }