From 4195d41814021cd1ba6f7e27e82d104bcd196f30 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Mon, 7 Aug 2017 12:28:44 +1200
Subject: [PATCH] removed outdated comments #story[1087]

---
 racevisionGame/src/main/java/mock/model/MockBoat.java |  2 ++
 racevisionGame/src/main/java/mock/model/MockRace.java | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockBoat.java b/racevisionGame/src/main/java/mock/model/MockBoat.java
index 795e2675..214d9c10 100644
--- a/racevisionGame/src/main/java/mock/model/MockBoat.java
+++ b/racevisionGame/src/main/java/mock/model/MockBoat.java
@@ -71,6 +71,8 @@ public class MockBoat extends Boat {
         //Get the start and end points.
         GPSCoordinate currentPosition = this.getCurrentPosition();
         GPSCoordinate nextMarkerPosition = this.getCurrentLeg().getEndCompoundMark().getAverageGPSCoordinate();
+//        GPSCoordinate nextMarkerPosition = this.getCurrentLeg().getEndCompoundMark().getMark1Position();
+//        todo:may need to change this so that boats are send to corners of the gates rather than the middle
 
         //Calculate bearing.
         Bearing bearing = GPSCoordinate.calculateBearing(currentPosition, nextMarkerPosition);
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index a3be5381..c534219b 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -779,7 +779,7 @@ public class MockRace extends Race {
         //boats must pass all checks in order to round a mark
         switch (boat.getRoundingStatus()) {
             case 0://hasn't started rounding
-                System.out.println("round 0");
+//                System.out.println("round 0");
                 if (boat.isPortSide(boat.getCurrentLeg().getEndCompoundMark().getMark1()) &&
                         GPSCoordinate.intersects(boat.getCurrentLeg().getEndCompoundMark().getMark1().getPosition(),
                                 roundingChecks.get(0), boat.getCurrentPosition())) {
@@ -787,7 +787,7 @@ public class MockRace extends Race {
                 }
                 break;
             case 1://has been parallel to the mark
-                System.out.println("round 1");
+//                System.out.println("round 1");
                 if (boat.isPortSide(boat.getCurrentLeg().getEndCompoundMark().getMark1()) &&
                         GPSCoordinate.intersects(boat.getCurrentLeg().getEndCompoundMark().getMark1().getPosition(),
                                 roundingChecks.get(1), boat.getCurrentPosition())) {
@@ -795,7 +795,7 @@ public class MockRace extends Race {
                 }
                 break;
             case 2://has traveled 180 degrees around the mark
-                System.out.println("round 2");
+//                System.out.println("round 2");
                 //Move boat on to next leg.
                 boat.resetRoundingStatus();
                 Leg nextLeg = this.legs.get(boat.getCurrentLeg().getLegNumber() + 1);
@@ -840,7 +840,7 @@ public class MockRace extends Race {
      * @param boat The boat to check.
      * @param timeElapsed The total time, in milliseconds, that has elapsed since the race started.
      */
-    protected void checkPosition(MockBoat boat, long timeElapsed) {//TODO cater for gates (SP or PS in the switch)
+    protected void checkPosition(MockBoat boat, long timeElapsed) {
 
         //The distance, in nautical miles, within which the boat needs to get in order to consider that it has reached the marker.
         double epsilonNauticalMiles = 250.0 / Constants.NMToMetersConversion; //250 meters.
@@ -864,7 +864,7 @@ public class MockRace extends Race {
 
             List<GPSCoordinate> roundingChecks = new ArrayList<GPSCoordinate>(Arrays.asList(roundCheck1, roundCheck2));
 
-            switch (boat.getCurrentLeg().getEndCompoundMark().getRoundingType()) {//todo may need to implement SP and PS
+            switch (boat.getCurrentLeg().getEndCompoundMark().getRoundingType()) {
                 case SP://Not yet implemented so these gates will be rounded port side
                 case Port:
                     boatRoundingCheckPort(boat, roundingChecks);