From 2126c44db93759a10fb68d19a8b271f2ee478263 Mon Sep 17 00:00:00 2001 From: cbt24 Date: Thu, 25 May 2017 13:35:40 +1200 Subject: [PATCH] Last minute changes to get ready for DoD #story[875] --- .../java/seng302/DataInput/XMLReader.java | 10 +++---- mock/src/main/java/seng302/MockOutput.java | 1 + mock/src/main/java/seng302/Model/Race.java | 30 ++++++++++--------- .../src/main/resources/scenes/race.fxml | 2 +- .../test/java/seng302/RaceConnectionTest.java | 1 + 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/mock/src/main/java/seng302/DataInput/XMLReader.java b/mock/src/main/java/seng302/DataInput/XMLReader.java index c01891e3..a44b4183 100644 --- a/mock/src/main/java/seng302/DataInput/XMLReader.java +++ b/mock/src/main/java/seng302/DataInput/XMLReader.java @@ -50,8 +50,8 @@ public abstract class XMLReader { /** * Alternate constructor - * @param xmlFile - * @param isWholeFile + * @param xmlFile File to be read + * @param isWholeFile boolean value whether entire file is being passed */ public XMLReader(String xmlFile, Boolean isWholeFile) { @@ -91,9 +91,9 @@ public abstract class XMLReader { /** * Get the contents of the XML FILe. - * @param document - * @return - * @throws TransformerException + * @param document holds all xml information + * @return String representation of document + * @throws TransformerException when document is malformed, and cannot be turned into a string */ public static String getContents(Document document) throws TransformerException { DOMSource source = new DOMSource(document); diff --git a/mock/src/main/java/seng302/MockOutput.java b/mock/src/main/java/seng302/MockOutput.java index 4e3d9508..5ec96d2a 100644 --- a/mock/src/main/java/seng302/MockOutput.java +++ b/mock/src/main/java/seng302/MockOutput.java @@ -108,6 +108,7 @@ public class MockOutput implements Runnable * @param lon longitude of boat * @param heading heading of boat * @param speed speed of boat + * @param time historical time of race */ public synchronized void parseBoatLocation(int sourceID, double lat, double lon, double heading, double speed, long time){ diff --git a/mock/src/main/java/seng302/Model/Race.java b/mock/src/main/java/seng302/Model/Race.java index 105de796..72a1b381 100644 --- a/mock/src/main/java/seng302/Model/Race.java +++ b/mock/src/main/java/seng302/Model/Race.java @@ -374,26 +374,29 @@ public class Race implements Runnable { } else { //Otherwise, the race is over! + System.out.println("test"); raceFinished.start(); setRaceStatusEnum(RaceStatusEnum.FINISHED); this.stop(); } - // Change wind direction - changeWindDir(); + if (getNumberOfActiveBoats() != 0) { + // Change wind direction + changeWindDir(); - //Parse the boat locations. - parseBoatLocations(); + //Parse the boat locations. + parseBoatLocations(); - //Parse the marks. - parseMarks(); + //Parse the marks. + parseMarks(); - //Parse the race status. - parseRaceStatus(); + //Parse the race status. + parseRaceStatus(); - //Update the last frame time. - this.lastFrameTime = currentTime; + //Update the last frame time. + this.lastFrameTime = currentTime; + } } }; @@ -404,7 +407,7 @@ public class Race implements Runnable { int iters = 0; @Override public void handle(long now) { - RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, 4, startTime, 0, 2300, 2, null); + RaceStatus raceStatus = new RaceStatus(System.currentTimeMillis(), raceId, 4, startTime, 0, 2300, 2, new ArrayList<>()); mockOutput.parseRaceStatus(raceStatus); if (iters > 500){ mockOutput.stop(); @@ -625,10 +628,10 @@ public class Race implements Runnable { boat.setVMG(newVMG); } - + this.updateEstimatedTime(boat); //Check the boats position (update leg and stuff). this.checkPosition(boat, totalTimeElapsed); - this.updateEstimatedTime(boat); + } } @@ -751,7 +754,6 @@ public class Race implements Runnable { boat.setTimeFinished(timeElapsed); boat.setCurrentSpeed(0); boat.setStatus(BoatStatusEnum.FINISHED); - } else if (doNotFinish()) { //Boat has pulled out of race. boat.setTimeFinished(timeElapsed); diff --git a/visualiser/src/main/resources/scenes/race.fxml b/visualiser/src/main/resources/scenes/race.fxml index fc6f5936..5f11b477 100644 --- a/visualiser/src/main/resources/scenes/race.fxml +++ b/visualiser/src/main/resources/scenes/race.fxml @@ -21,7 +21,7 @@ - + diff --git a/visualiser/src/test/java/seng302/RaceConnectionTest.java b/visualiser/src/test/java/seng302/RaceConnectionTest.java index 5bf153ad..47b3cdae 100644 --- a/visualiser/src/test/java/seng302/RaceConnectionTest.java +++ b/visualiser/src/test/java/seng302/RaceConnectionTest.java @@ -29,6 +29,7 @@ public class RaceConnectionTest { assertTrue(onlineConnection.check()); } + @Test public void offlineConnectionStatusOffline() { assertFalse(offlineConnection.check());