From 848edfc6a4e50ee4db2aa8be80af18cb4ca74373 Mon Sep 17 00:00:00 2001 From: zwu18 Date: Sat, 12 Aug 2017 03:20:21 +1200 Subject: [PATCH] Removed commented out code. Merged master in. #story[1097] --- .../java/mock/model/commandFactory/TackGybeCommand.java | 8 -------- .../main/java/mock/model/commandFactory/VMGCommand.java | 1 - 2 files changed, 9 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java index f98ce671..d78fd5e1 100644 --- a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java +++ b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java @@ -22,16 +22,8 @@ public class TackGybeCommand implements Command { this.boat = boat; } - //The refactoring of MockRace will require changes to be made @Override public void execute() { - /*if(boat.getBearing().degrees()>180){ - boat.setBearing(Bearing.fromDegrees(360 - race.getWindDirection().degrees())); - } else { - boat.setBearing(Bearing.fromDegrees(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 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 17e5155c..8c7d2043 100644 --- a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java +++ b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java @@ -20,7 +20,6 @@ public class VMGCommand implements Command { this.boat = boat; } - //The refactoring of MockRace will require changes to be made @Override public void execute() { if (boat.getAutoVMG()){