Merge branch 'article4'

Author: IntegerMan

MattEland.FSharpGeneticAgorithm.ConsoleTestApp/Program.fs

@@ -33,7 +33,7 @@ let main argv =
 
   let world = makeTestWorld false
 
-  let mutable state = { World = world; SimState = Simulating; TurnsLeft=30}
+  let mutable state = { World = world; SimState = SimulationState.Simulating; TurnsLeft=30}
   let mutable simulating: bool = true
 
   while simulating do

MattEland.FSharpGeneticAlgorithm.Logic/Simulator.fs

@@ -6,7 +6,7 @@ open MattEland.FSharpGeneticAlgorithm.Logic.Actors
 open MattEland.FSharpGeneticAlgorithm.Logic.Commands
 open MattEland.FSharpGeneticAlgorithm.Logic.WorldGeneration
 
-type SimulationState = Simulating | Won | Lost
+type SimulationState = Simulating=0 | Won=1 | Lost=2
 
 type GameState = { World : World; SimState: SimulationState; TurnsLeft: int}
 
@@ -36,7 +36,7 @@ let moveActor state actor pos =
         Doggo = {world.Doggo with Pos = pos}
       }}
     else
-      {state with SimState = Lost; World = {world with
+      {state with SimState = SimulationState.Lost; World = {world with
         Squirrel = {world.Squirrel with IsActive = false}
         Doggo = {world.Doggo with Pos = pos}
         }
@@ -55,7 +55,7 @@ let moveActor state actor pos =
     else if hasAcorn && otherActor.ActorKind = Tree then
       // Moving to the tree with the acorn - this should win the game
       {
-        state with SimState = Won; World = { 
+        state with SimState = SimulationState.Won; World = { 
           world with Squirrel = {ActorKind = Squirrel true; Pos = pos; IsActive = true} 
         }
       }
@@ -108,11 +108,11 @@ let simulateDoggo (state: GameState) =
     state
 
 let decreaseTimer (state: GameState) =
-  if state.SimState = Simulating then
+  if state.SimState = SimulationState.Simulating then
     if state.TurnsLeft > 0 then
       {state with TurnsLeft = state.TurnsLeft - 1}
     else
-      {state with TurnsLeft = 0; SimState = Lost}
+      {state with TurnsLeft = 0; SimState = SimulationState.Lost}
   else
     state
 
@@ -144,10 +144,19 @@ let handlePlayerCommand state command =
 let playTurn state getRandomNumber command =
   let world = state.World
   match command with 
-  | Restart -> { World = makeWorld world.MaxX world.MaxY getRandomNumber; SimState = Simulating; TurnsLeft = 30 }
+  | Restart -> { World = makeWorld world.MaxX world.MaxY getRandomNumber; SimState = SimulationState.Simulating; TurnsLeft = 30 }
   | _ -> 
     match state.SimState with
-    | Simulating -> 
+    | SimulationState.Simulating -> 
       let newState = handlePlayerCommand state command 
       simulateActors newState getRandomNumber
     | _ -> state
+
+let simulateTurn state command =
+  if state.SimState = SimulationState.Simulating then
+    let random = new System.Random()
+    let newState = handlePlayerCommand state command
+    simulateActors(newState) random.Next
+  else
+    state
+  

MattEland.FSharpGeneticAlgorithm.Logic/WorldGeneration.fs

@@ -48,6 +48,10 @@ let makeWorld maxX maxY random =
     Acorn = actors.[3]
     Rabbit = actors.[4] }
 
+let makeDefaultWorld() =
+  let random = new System.Random()
+  makeWorld 13 13 random.Next
+
 let makeTestWorld hasAcorn = 
   {
     MaxX = 13; 

MattEland.FSharpGeneticAlgorithm.Logic/WorldPos.fs

@@ -11,6 +11,6 @@ let isAdjacentTo (posA: WorldPos) (posB: WorldPos): bool =
   result
 
 let getRandomPos(maxX:int32, maxY:int32, getRandom): WorldPos =
-  let x = getRandom maxX
-  let y = getRandom maxY
+  let x = 1 + getRandom maxX 
+  let y = 1 + getRandom maxY
   newPos x y

MattEland.FSharpGeneticAlgorithm.Tests/Tests.fs

@@ -21,7 +21,7 @@ let ``Point Adjaency Tests`` (x1, y1, x2, y2, expectedAdjacent) =
     isAdjacentTo pos1 pos2 |> should equal expectedAdjacent
 
 let getRandomNumber (max: int): int = 42
-let buildTestState = {World=(makeTestWorld false); SimState=Simulating; TurnsLeft = 30}
+let buildTestState = {World=(makeTestWorld false); SimState=SimulationState.Simulating; TurnsLeft = 30}
 
 [<Fact>]
 let ``Rabbit should move randomly`` () =
@@ -60,7 +60,7 @@ let ``Squirrel Getting Acorn to Tree Should Win Game`` () =
 
   // Assert
   newState.World.Squirrel.Pos |> should equal state.World.Tree.Pos
-  newState.SimState |> should equal Won
+  newState.SimState |> should equal SimulationState.Won
 
 [<Fact>]
 let ``Dog Should Eat Squirrel If Adjacent`` () =
@@ -75,7 +75,7 @@ let ``Dog Should Eat Squirrel If Adjacent`` () =
   // Assert
   newState.World.Doggo.Pos |> should equal newState.World.Squirrel.Pos
   newState.World.Squirrel.IsActive |> should equal false
-  newState.SimState |> should equal Lost
+  newState.SimState |> should equal SimulationState.Lost
 
 [<Fact>]
 let ``Simulating actors should decrease the turns left counter`` () =   
@@ -97,4 +97,4 @@ let ``Running out of turns should lose the simulation`` () =
   let newState = simulateActors state getRandomNumber
 
   // Assert
-  newState.SimState |> should equal Lost
+  newState.SimState |> should equal SimulationState.Lost

MattEland.FSharpGeneticAlgorithm.WindowsClient/Acorn.png

@@ -0,0 +1,26 @@
+using System;
+using System.Windows.Input;
+
+namespace MattEland.FSharpGeneticAlgorithm.WindowsClient
+{
+    public class ActionCommand : ICommand
+    {
+        private readonly Action<object> _invokedAction;
+
+        public ActionCommand(Action invokedAction)
+        {
+            _invokedAction = _ => invokedAction?.Invoke();
+        }
+
+        public ActionCommand(Action<object> invokedAction)
+        {
+            _invokedAction = invokedAction;
+        }
+
+        public bool CanExecute(object parameter) => true;
+
+        public void Execute(object parameter) => _invokedAction?.Invoke(parameter);
+
+        public event EventHandler CanExecuteChanged;
+    }
+}

MattEland.FSharpGeneticAlgorithm.WindowsClient/ActionCommand.cs

@@ -0,0 +1,58 @@
+using MattEland.FSharpGeneticAlgorithm.Logic;
+
+namespace MattEland.FSharpGeneticAlgorithm.WindowsClient
+{
+    internal class ActorViewModel
+    {
+        private readonly Actors.Actor _actor;
+
+        public ActorViewModel(Actors.Actor actor)
+        {
+            _actor = actor;
+        }
+
+        // Subtract 1 since my data's indexes start at 1 instead of 0
+        public int PosX => (_actor.Pos.X - 1) * 10;
+        public int PosY => (_actor.Pos.Y - 1) * 10;
+
+        public string Text => Actors.getChar(_actor).ToString();
+
+        public string ImagePath
+        {
+            get
+            {
+                if (_actor.ActorKind.Equals(Actors.ActorKind.Acorn))
+                {
+                    return "Acorn.png";
+                }
+
+                if (_actor.ActorKind.Equals(Actors.ActorKind.Doggo))
+                {
+                    return "Doggo.png";
+                }
+
+                if (_actor.ActorKind.Equals(Actors.ActorKind.Rabbit))
+                {
+                    return "Rabbit.png";
+                }
+
+                if (_actor.ActorKind.Equals(Actors.ActorKind.Tree))
+                {
+                    return "Tree.png";
+                }
+
+                if (_actor.ActorKind.Equals(Actors.ActorKind.NewSquirrel(true)))
+                {
+                    return "SquirrelAcorn.png";
+                }
+
+                if (_actor.ActorKind.Equals(Actors.ActorKind.NewSquirrel(false)))
+                {
+                    return "Squirrel.png";
+                }
+
+                return null;
+            }
+        }
+    }
+}

MattEland.FSharpGeneticAlgorithm.WindowsClient/ActorViewModel.cs

@@ -0,0 +1,8 @@
+<Application x:Class="MattEland.FSharpGeneticAlgorithm.WindowsClient.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:MattEland.FSharpGeneticAlgorithm.WindowsClient"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+    </Application.Resources>
+</Application>

MattEland.FSharpGeneticAlgorithm.WindowsClient/App.xaml

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace MattEland.FSharpGeneticAlgorithm.WindowsClient
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}