From 9ab12a9c58c23728c877afc0938d671e59f29c4a Mon Sep 17 00:00:00 2001
From: fjc40 <fjc40@uclive.ac.nz>
Date: Tue, 15 Aug 2017 18:48:14 +1200
Subject: [PATCH] MockBoat: Removed redundant isAutoVMG() function.
 TackGybeCommand now disables autoVMG. Removed print statements from
 VMGCommand.

---
 racevisionGame/src/main/java/mock/model/MockBoat.java          | 3 ---
 racevisionGame/src/main/java/mock/model/MockRace.java          | 2 +-
 .../main/java/mock/model/commandFactory/TackGybeCommand.java   | 3 +++
 .../src/main/java/mock/model/commandFactory/VMGCommand.java    | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/MockBoat.java b/racevisionGame/src/main/java/mock/model/MockBoat.java
index c62779d6..f15ec2f2 100644
--- a/racevisionGame/src/main/java/mock/model/MockBoat.java
+++ b/racevisionGame/src/main/java/mock/model/MockBoat.java
@@ -297,9 +297,6 @@ public class MockBoat extends Boat {
         this.roundingStatus = 0;
     }
 
-    public boolean isAutoVMG() {
-        return autoVMG;
-    }
 
     public void setAutoVMG(boolean autoVMG) {
         this.autoVMG = autoVMG;
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 3970f5d0..3879e3fc 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -335,7 +335,7 @@ public class MockRace extends Race {
             boat.moveForwards(distanceTravelledMeters);
             boat.setTimeSinceTackChange(boat.getTimeSinceTackChange() + updatePeriodMilliseconds);
 
-            if (boat.isAutoVMG()) {
+            if (boat.getAutoVMG()) {
                 newOptimalVMG(boat);
             }
 
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
index 50023719..d0b0584b 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
@@ -23,6 +23,9 @@ public class TackGybeCommand implements Command {
 
     @Override
     public void execute() {
+
+        boat.setAutoVMG(false);
+
         double boatAngle = boat.getBearing().degrees();
         double windAngle =race.getWindDirection().degrees();
         double differenceAngle = calcDistance(boatAngle, windAngle);
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
index 8c7d2043..39469cf8 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
@@ -24,10 +24,8 @@ public class VMGCommand implements Command {
     public void execute() {
         if (boat.getAutoVMG()){
             boat.setAutoVMG(false);
-            System.out.println("Auto VMG off!");
         } else {
             boat.setAutoVMG(true);
-            System.out.println("Auto VMG on!");
         }
     }
 }