From 7f37dbbcb5057b591049b08f61497546db44632c Mon Sep 17 00:00:00 2001 From: fjc40 Date: Sun, 14 May 2017 17:54:27 +1200 Subject: [PATCH] Mock.Race: Usages of VMG.bearing now use the getBearing() function, as the member is now private. #story[873] --- mock/src/main/java/seng302/Model/Race.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mock/src/main/java/seng302/Model/Race.java b/mock/src/main/java/seng302/Model/Race.java index a1ae7f8c..65942912 100644 --- a/mock/src/main/java/seng302/Model/Race.java +++ b/mock/src/main/java/seng302/Model/Race.java @@ -315,9 +315,9 @@ public class Race implements Runnable { boat.calculateBearingToDestination(), min(bound1, bound2), max(bound1,bound2)); - double azimuth = newHeading.bearing; - if (newHeading.bearing > 180){ - azimuth = newHeading.bearing -360; + double azimuth = newHeading.getBearing(); + if (newHeading.getBearing() > 180){ + azimuth = newHeading.getBearing() -360; } // if (!GPSCoordinate.isInsideBoundary(calculatePosition(boat.getCurrentPosition(), @@ -327,11 +327,11 @@ public class Race implements Runnable { // newHeading.bearing = tempHeading; // } - boat.setHeading(newHeading.bearing); - boat.setVelocity(newHeading.speed); + boat.setHeading(newHeading.getBearing()); + boat.setVelocity(newHeading.getSpeed()); //calc the distance travelled in a straight line to windward - double angleBetweenDestAndHeading = newHeading.bearing - boat.calculateBearingToDestination(); + double angleBetweenDestAndHeading = newHeading.getBearing() - boat.calculateBearingToDestination(); totalDistanceTravelled = cos(angleBetweenDestAndHeading)*totalDistanceTravelledInTack; boat.setDistanceTravelledInLeg(totalDistanceTravelled);