From f8d3f531588e24b541d1a67804b85a2f252272c6 Mon Sep 17 00:00:00 2001
From: Peter <ptg19@uclive.ac.nz>
Date: Thu, 30 Mar 2017 14:45:33 +1300
Subject: [PATCH] changed boat speed to a lower value

---
 doc/examples/config.xml                       |  9 ---
 doc/examples/course.xml                       | 71 -------------------
 doc/examples/teams.xml                        | 34 ---------
 .../seng302/controllers/CanvasController.java |  2 +-
 src/main/resources/config/teams.xml           | 12 ++--
 .../BoatPositionControllerTest.java           | 34 ---------
 6 files changed, 7 insertions(+), 155 deletions(-)
 delete mode 100644 doc/examples/config.xml
 delete mode 100644 doc/examples/course.xml
 delete mode 100644 doc/examples/teams.xml
 delete mode 100644 src/test/java/seng302/controllers/BoatPositionControllerTest.java

diff --git a/doc/examples/config.xml b/doc/examples/config.xml
deleted file mode 100644
index 4a1b0770..00000000
--- a/doc/examples/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" ?>
-
-<configurations>
-    <race-name>AC35</race-name>
-    <race-size>6</race-size>
-    <time-scale>1.0</time-scale>
-    <wind-direction>135</wind-direction>
-</configurations>
-
diff --git a/doc/examples/course.xml b/doc/examples/course.xml
deleted file mode 100644
index f8bfa00e..00000000
--- a/doc/examples/course.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" ?>
-
-<course>
-    <marks>
-        <gate>
-            <name type="start-line">Start</name>
-            <mark>
-                <name>Start1</name>
-                <latitude>32.296577</latitude>
-                <longitude>-64.854304</longitude>
-            </mark>
-            <mark>
-                <name>Start2</name>
-                <latitude>32.293771</latitude>
-                <longitude>-64.855242</longitude>
-            </mark>
-        </gate>
-        <mark>
-            <name>Mid Mark</name>
-            <latitude>32.293039</latitude>
-            <longitude>-64.843983</longitude>
-        </mark>
-        <gate>
-            <name>Leeward Gate</name>
-            <mark>
-                <name>Leeward Gate1</name>
-                <latitude>32.284680</latitude>
-                <longitude>-64.850045</longitude>
-            </mark>
-            <mark>
-                <name>Leeward Gate2</name>
-                <latitude>32.280164</latitude>
-                <longitude>-64.847591</longitude>
-            </mark>
-        </gate>
-        <gate>
-            <name>Windward Gate</name>
-            <mark>
-                <name>Windward Gate1</name>
-                <latitude>32.309693</latitude>
-                <longitude>-64.835249</longitude>
-            </mark>
-            <mark>
-                <name>Windward Gate2</name>
-                <latitude>32.308046</latitude>
-                <longitude>-64.831785</longitude>
-            </mark>
-        </gate>
-        <gate type="finish-line">
-            <name>Finish</name>
-            <mark>
-                <name>Finish1</name>
-                <latitude>32.317379</latitude>
-                <longitude>-64.839291</longitude>
-            </mark>
-            <mark>
-                <name>Finish2</name>
-                <latitude>32.317257</latitude>
-                <longitude>-64.836260</longitude>
-            </mark>
-        </gate>
-    </marks>
-    <order>
-        <one>Start</one>
-        <two>Mid Mark</two>
-        <three>Leeward Gate</three>
-        <four>Windward Gate</four>
-        <five>Leeward Gate</five>
-        <six>Finish</six>
-    </order>
-</course>
diff --git a/doc/examples/teams.xml b/doc/examples/teams.xml
deleted file mode 100644
index ed8cfcf1..00000000
--- a/doc/examples/teams.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" ?>
-
-<teams>
-    <team>
-        <name>Oracle Team USA</name>
-        <alias>USA</alias>
-        <velocity>30.9</velocity>
-    </team>
-    <team>
-        <name>Artemis Racing</name>
-        <alias>ART</alias>
-        <velocity>59.3</velocity>
-    </team>
-    <team>
-        <name>Emirates Team New Zealand</name>
-        <alias>NZL</alias>
-        <velocity>51.5</velocity>
-    </team>
-    <team>
-        <name>Land Rover BAR</name>
-        <alias>BAR</alias>
-        <velocity>29.9</velocity>
-    </team>
-    <team>
-        <name>SoftBank Team Japan</name>
-        <alias>JAP</alias>
-        <velocity>99.6</velocity>
-    </team>
-    <team>
-        <name>Groupama Team France</name>
-        <alias>FRC</alias>
-        <velocity>45.6</velocity>
-    </team>
-</teams>
\ No newline at end of file
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 0ec93c83..96e0d0c1 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -150,7 +150,7 @@ public class CanvasController {
      */
     private void drawWake(GraphicsContext gc, double x, double y, double speed, Color color, double heading){
         double angle = Math.toRadians(heading);
-        speed = speed * 0.5; // Half the size of the wake
+        speed = speed * 10;
         Point newP = new Point(0, speed);
         newP.rotate(angle);
 
diff --git a/src/main/resources/config/teams.xml b/src/main/resources/config/teams.xml
index ed8cfcf1..971ffbf8 100644
--- a/src/main/resources/config/teams.xml
+++ b/src/main/resources/config/teams.xml
@@ -4,31 +4,31 @@
     <team>
         <name>Oracle Team USA</name>
         <alias>USA</alias>
-        <velocity>30.9</velocity>
+        <velocity>1</velocity>
     </team>
     <team>
         <name>Artemis Racing</name>
         <alias>ART</alias>
-        <velocity>59.3</velocity>
+        <velocity>1.1</velocity>
     </team>
     <team>
         <name>Emirates Team New Zealand</name>
         <alias>NZL</alias>
-        <velocity>51.5</velocity>
+        <velocity>2</velocity>
     </team>
     <team>
         <name>Land Rover BAR</name>
         <alias>BAR</alias>
-        <velocity>29.9</velocity>
+        <velocity>1.3</velocity>
     </team>
     <team>
         <name>SoftBank Team Japan</name>
         <alias>JAP</alias>
-        <velocity>99.6</velocity>
+        <velocity>1.7</velocity>
     </team>
     <team>
         <name>Groupama Team France</name>
         <alias>FRC</alias>
-        <velocity>45.6</velocity>
+        <velocity>1.4</velocity>
     </team>
 </teams>
\ No newline at end of file
diff --git a/src/test/java/seng302/controllers/BoatPositionControllerTest.java b/src/test/java/seng302/controllers/BoatPositionControllerTest.java
deleted file mode 100644
index 5cfdf1d6..00000000
--- a/src/test/java/seng302/controllers/BoatPositionControllerTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package seng302.controllers;
-
-import org.junit.Test;
-//import static org.mockito.Mockito.when;
-
-/**
- * Created by ptg19 on 23/03/17.
- */
-public class BoatPositionControllerTest {
-    @Test
-    public void handleEvent() throws Exception {
-//        BoatPositionController controller = new BoatPositionController();
-//        Boat boat1 = new Boat("boat1");
-//        Boat boat2 = new Boat("boat2");
-//        Boat boat3 = new Boat("boat3");
-//
-//        Event event1 = new Event(1.0, boat1, new SingleMark("mark0"), new SingleMark("mark1"), 0);
-//        Event event2 = new Event(1.0, boat2, new SingleMark("mark0"), new SingleMark("mark1"), 0);
-//        Event event3 = new Event(1.0, boat3, new SingleMark("mark0"), new SingleMark("mark1"), 0);
-//        controller.handleEvent(event1);
-//        controller.handleEvent(event2);
-//        controller.handleEvent(event3);
-//        assertEquals(controller.getBoatOrder(), new ArrayList<Boat>(Arrays.asList(boat1, boat2, boat3)));
-
-
-//        Event event4 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 0);
-//        Event event5 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1);
-//        Event event6 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1);
-//        Event event7 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1);
-//        Event event8 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1);
-//        Event event9 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1);
-    }
-
-}
\ No newline at end of file