Merge remote-tracking branch 'remotes/origin/master' into CommandFactory

# Conflicts: # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
2017-08-15 01:01:06 +12:00
parent b97bfe62a6 cdcd326b7c
commit 847cd1251e
19 changed files with 951 additions and 83 deletions
@@ -2,7 +2,6 @@ package mock.model.commandFactory;

 import mock.model.MockBoat;
 import mock.model.MockRace;
-import mock.model.VMG;
 import shared.model.Bearing;

 /**
@@ -44,8 +43,7 @@ public class TackGybeCommand implements Command {
     */
    public double calcDistance(double degreeA, double degreeB){
        double phi = Math.abs(degreeB - degreeA) % 360;
-        double distance = phi > 180 ? 360 - phi : phi;
-        return distance;
+        return phi > 180 ? 360 - phi : phi;
    }

 }