Class for shifting wind. #story[1187]

racevisionGame/src/main/java/mock/app/Event.java

@@ -4,6 +4,8 @@ import mock.dataInput.PolarParser;
 import mock.exceptions.EventConstructionException;
 import mock.model.*;
 import mock.model.commandFactory.CompositeCommand;
+import mock.model.wind.RandomWindGenerator;
+import mock.model.wind.WindGenerator;
 import mock.xml.RaceXMLCreator;
 import network.Messages.LatestMessages;
 import org.xml.sax.SAXException;
@@ -18,16 +20,8 @@ import shared.model.Constants;
 
 import javax.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 
 /**

racevisionGame/src/main/java/mock/model/MockRace.java

@@ -1,9 +1,6 @@
 package mock.model;
 
-import javafx.animation.AnimationTimer;
-import mock.xml.*;
-import network.Messages.BoatLocation;
-import network.Messages.BoatStatus;
+import mock.model.wind.WindGenerator;
 import network.Messages.Enums.BoatStatusEnum;
 import network.Messages.Enums.RaceStatusEnum;
 import shared.dataInput.BoatDataSource;

racevisionGame/src/main/java/mock/model/wind/ConstantWindGenerator.java

@@ -1,11 +1,9 @@
-package mock.model;
+package mock.model.wind;
 
 
 import shared.model.Bearing;
 import shared.model.Wind;
 
-import java.util.Random;
-
 /**
  * This class generates Wind objects for use in a MockRace.
  * Initialised with a baseline wind speed and direction, and keeps it constant.

racevisionGame/src/main/java/mock/model/wind/RandomWindGenerator.java

@@ -1,4 +1,4 @@
-package mock.model;
+package mock.model.wind;
 
 
 import shared.model.Bearing;

racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java

@@ -0,0 +1,51 @@
+package mock.model.wind;
+
+import shared.model.Bearing;
+import shared.model.Wind;
+
+/**
+ * Created by jjg64 on 28/08/17.
+ */
+public class ShiftingWindGenerator implements WindGenerator {
+    Bearing baselineBearing;
+    double baseLineSpeed;
+    double maxBearingVariance = 5;  // In degrees
+    double oscillationPeriod = 3e6;  // In milliseconds
+
+    public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) {
+        this.baselineBearing = baselineBearing;
+        this.baseLineSpeed = baseLineSpeed;
+    }
+
+    @Override
+    public Wind generateBaselineWind() {
+        return new Wind(baselineBearing, baseLineSpeed);
+    }
+
+    @Override
+    public Wind generateNextWind(Wind currentWind) {
+        return changeWind(currentWind);
+    }
+
+    private Wind changeWind(Wind currentWind) {
+        currentWind = oscillateWind(currentWind);
+        currentWind = shiftWind(currentWind);
+        return currentWind;
+    }
+
+    private Wind oscillateWind(Wind currentWind) {
+        return currentWind;
+    }
+
+    private Wind shiftWind(Wind currentWind) {
+        return currentWind;
+    }
+
+    public void setMaxBearingVariance(double maxBearingVariance) {
+        this.maxBearingVariance = maxBearingVariance;
+    }
+
+    public void setOscillationPeriod(double oscillationPeriod) {
+        this.oscillationPeriod = oscillationPeriod;
+    }
+}

racevisionGame/src/main/java/mock/model/wind/WindGenerator.java

@@ -1,4 +1,4 @@
-package mock.model;
+package mock.model.wind;
 
 import shared.model.Wind;
 

racevisionGame/src/test/java/mock/model/ConstantWindGeneratorTest.java

@@ -1,5 +1,7 @@
 package mock.model;
 
+import mock.model.wind.ConstantWindGenerator;
+import mock.model.wind.WindGenerator;
 import org.junit.Before;
 import org.junit.Test;
 import shared.model.Bearing;

racevisionGame/src/test/java/mock/model/MockRaceTest.java

@@ -1,7 +1,8 @@
 package mock.model;
 
 import mock.dataInput.PolarParserTest;
-import network.Messages.LatestMessages;
+import mock.model.wind.ConstantWindGenerator;
+import mock.model.wind.WindGenerator;
 import shared.dataInput.*;
 import shared.exceptions.InvalidBoatDataException;
 import shared.exceptions.InvalidRaceDataException;
@@ -9,8 +10,6 @@ import shared.exceptions.InvalidRegattaDataException;
 import shared.model.Bearing;
 import shared.model.Constants;
 
-import static org.junit.Assert.*;
-
 public class MockRaceTest {
 //TODO
 

racevisionGame/src/test/java/mock/model/RandomWindGeneratorTest.java

@@ -1,5 +1,6 @@
 package mock.model;
 
+import mock.model.wind.RandomWindGenerator;
 import org.junit.Before;
 import org.junit.Test;
 import shared.model.Bearing;