From a38898982764d19815b981b0e1879d50f05fb706 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Sun, 6 Aug 2017 16:38:44 +1200
Subject: [PATCH] Reworked TackGybeCommand. Current boat in race will now tack
 and gybe when control is pressed.

#Story[1097]
---
 .../model/commandFactory/TackGybeCommand.java | 22 ++++++++++++++++---
 .../mock/model/commandFactory/VMGCommand.java |  7 ------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
index ff04c54e..f964a17e 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
@@ -25,9 +25,25 @@ public class TackGybeCommand implements Command {
         } else {
             boat.setBearing(Bearing.fromDegrees(race.getWindDirection().degrees()));
         }*/
-        System.out.println(race.getWindDirection().degrees());
-        double angle = Math.max(race.getWindDirection().degrees(), boat.getBearing().degrees()) - Math.min(race.getWindDirection().degrees(), boat.getBearing().degrees());
-        boat.setBearing(Bearing.fromDegrees(angle));
+        /*double angle = Math.max(race.getWindDirection().degrees(), boat.getBearing().degrees()) - Math.min(race.getWindDirection().degrees(), boat.getBearing().degrees());
+        boat.setBearing(Bearing.fromDegrees(angle));*/
+        double boatAngle = boat.getBearing().degrees();
+        double windAngle =race.getWindDirection().degrees();
+        double differenceAngle = calcDistance(boatAngle, windAngle);
+        double angleA = windAngle + differenceAngle;
+        double angleB = windAngle - differenceAngle;
+        if(angleA % 360 == boatAngle){
+            boat.setBearing(Bearing.fromDegrees(angleB));
+        } else {
+            boat.setBearing(Bearing.fromDegrees(angleA));
+        }
+    }
+
+    private double calcDistance(double degreeA, double degreeB){
+        double phi = Math.abs(degreeB - degreeA) % 360;
+        double distance = phi > 180 ? 360 - phi : phi;
+        return distance;
     }
+
 }
 
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
index 9cd558a5..d6e3d988 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
@@ -18,13 +18,6 @@ public class VMGCommand implements Command {
     //The refactoring of MockRace will require changes to be made
     @Override
     public void execute() {
-        /*VMG newVMG = boat.getPolars().calculateVMG(
-                race.getWindDirection(),
-                race.getWindSpeed(),
-                boat.calculateBearingToNextMarker(),
-                Bearing.fromDegrees(0d),
-                Bearing.fromDegrees(359.99999d));
-        boat.setVMG(newVMG);*/
         if (boat.getAutoVMG()){
             boat.setAutoVMG(false);
             System.out.println("Auto VMG off!");