From 2db4beadcb96dbe61175d668cf0ad8256ff7df76 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Wed, 8 Mar 2017 16:24:51 +1300
Subject: [PATCH] Boats now display knots, also the racecouse has been modified
 to reflect the AC35 racecourse via linear coordinates.

---
 src/main/java/seng302/App.java   | 13 ++++++-------
 src/main/java/seng302/Event.java |  2 +-
 src/main/java/seng302/Race.java  |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index bca0a609..e30ea646 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -19,18 +19,17 @@ public class App
         Boat boat5 = new Boat("Land Rover BAR", 10);
         Boat boat6 = new Boat("SoftBank Team Japan", 9);
 
-        RaceMarker mark1 = new RaceMarker("Start", 0, 0, 0);
-        RaceMarker mark2 = new RaceMarker("Mark", 120, 120, 0);
-        RaceMarker mark3 = new RaceMarker("Leeward Gate", 240, 240, 0);
-        RaceMarker mark4 = new RaceMarker("Windward Gate", 360, 240, 120);
-        RaceMarker mark5 = new RaceMarker("Leeward Gate", 480, 240, 0);
-        RaceMarker mark6 = new RaceMarker("Finish", 600, 360, 0);
+        RaceMarker mark1 = new RaceMarker("Start", 0, 0, 59);
+        RaceMarker mark2 = new RaceMarker("Mark", 72, 72, 50);
+        RaceMarker mark3 = new RaceMarker("Leeward Gate", 193, 126, 158);
+        RaceMarker mark4 = new RaceMarker("Windward Gate", 373, 41, 0);
+        RaceMarker mark5 = new RaceMarker("Leeward Gate", 553, 126, 158);
+        RaceMarker mark6 = new RaceMarker("Finish", 607, 95, 203);
 
         Boat[] boats = {boat1, boat2, boat3, boat4, boat5, boat6};
         RaceMarker[] marks = {mark1, mark2, mark3, mark4, mark5, mark6};
 
         Race race = new ConstantVelocityRace(boats, marks);
         race.simulateRace();
-
     }
 }
diff --git a/src/main/java/seng302/Event.java b/src/main/java/seng302/Event.java
index 521c69d8..a390c535 100644
--- a/src/main/java/seng302/Event.java
+++ b/src/main/java/seng302/Event.java
@@ -43,7 +43,7 @@ public class Event {
     public String toString() {
         String stringToReturn = boat.getName() + " passed " + raceMarker.toString() + " at " + time + " seconds";
         if (goalMarker != null){
-            stringToReturn += " at heading " + calculateHeading();
+            stringToReturn += " at heading " + (int) calculateHeading();
         }
         stringToReturn += ".";
         return stringToReturn;
diff --git a/src/main/java/seng302/Race.java b/src/main/java/seng302/Race.java
index 143d3bfb..27801cb5 100644
--- a/src/main/java/seng302/Race.java
+++ b/src/main/java/seng302/Race.java
@@ -21,7 +21,7 @@ public class Race {
         System.out.println("Boats Participating.");
         System.out.println("====================");
         for (int i = 0; i < boats.length; i ++){
-            System.out.println(i + 1 + ". " + boats[i].getName());
+            System.out.println(i + 1 + ". " + boats[i].getName() + ", Speed: " + Math.round(boats[i].getVelocity() * 1.94384) + "kn");
         }
 
         System.out.println("\nRace Events");