Audit Refactors - Created AC35RaceStatus class - Deleted wait loop into a Thread.sleep() - Deleted Entirely commented out class.... - Deleted duplicate draw that appeared again #story[873] See merge request !4main
Erika Savell
9 years ago
commit
dc9cdab4d7
@ -0,0 +1,170 @@
|
||||
package seng302;
|
||||
|
||||
import javafx.application.Platform;
|
||||
import org.xml.sax.SAXException;
|
||||
import seng302.Mock.BoatXMLReader;
|
||||
import seng302.Mock.RegattaXMLReader;
|
||||
import seng302.Mock.StreamedCourseXMLException;
|
||||
import seng302.Mock.StreamedCourseXMLReader;
|
||||
import seng302.Networking.Messages.*;
|
||||
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Created by Gondr on 18/05/2017.
|
||||
*/
|
||||
public class AC35RaceStatus {
|
||||
private final VisualiserInput visualiserInput;
|
||||
protected AverageWind averageWind;
|
||||
protected final Map<Integer, BoatLocation> boatLocation = new HashMap<>();
|
||||
protected final Map<Integer, BoatStatus> boatStatusMap = new HashMap<>();
|
||||
protected final Map<Integer, MarkRounding> markRoundingMap = new HashMap<>();
|
||||
protected CourseWinds courseWinds;
|
||||
protected RaceMessage raceMessage;
|
||||
protected RaceStartStatus raceStartStatus;
|
||||
protected RaceStatus raceStatus;
|
||||
|
||||
public AC35RaceStatus(VisualiserInput visualiserInput){
|
||||
this.visualiserInput = visualiserInput;
|
||||
averageWind = null;
|
||||
courseWinds = null;
|
||||
raceMessage = null;
|
||||
raceStartStatus = null;
|
||||
raceStatus = null;
|
||||
}
|
||||
|
||||
public void update(AC35Data message){
|
||||
//Checks which message is being received and does what is needed for that message.
|
||||
//Heartbeat.
|
||||
switch(message.getType()) {
|
||||
case HEARTBEAT:
|
||||
Heartbeat heartbeat = (Heartbeat) message;
|
||||
|
||||
//Check that the heartbeat number is greater than the previous value, and then set the last heartbeat time.
|
||||
if (heartbeat.getSequenceNumber() > visualiserInput.getLastHeartbeatSequenceNum()) {
|
||||
visualiserInput.setLastHeartbeatTime(System.currentTimeMillis());
|
||||
visualiserInput.setLastHeartbeatSequenceNum(heartbeat.getSequenceNumber());
|
||||
//System.out.println("HeartBeat Message! " + lastHeartbeatSequenceNum);
|
||||
}
|
||||
break;
|
||||
case RACESTATUS:
|
||||
RaceStatus raceStatus = (RaceStatus) message;
|
||||
|
||||
//System.out.println("Race Status Message");
|
||||
this.raceStatus = raceStatus;
|
||||
for (BoatStatus boatStatus : this.raceStatus.getBoatStatuses()) {
|
||||
this.boatStatusMap.put(boatStatus.getSourceID(), boatStatus);
|
||||
}
|
||||
visualiserInput.setCourseWindDirection(raceStatus.getScaledWindDirection());
|
||||
break;
|
||||
case DISPLAYTEXTMESSAGE:
|
||||
//System.out.println("Display Text Message");
|
||||
//No decoder for this.
|
||||
break;
|
||||
case XMLMESSAGE:
|
||||
XMLMessage xmlMessage = (XMLMessage) message;
|
||||
|
||||
//System.out.println("XML Message!");
|
||||
|
||||
Platform.runLater(() -> {
|
||||
if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeRegatta) {
|
||||
//System.out.println("Setting Regatta");
|
||||
try {
|
||||
visualiserInput.getCourse().setRegattaXMLReader(new RegattaXMLReader(xmlMessage.getXmlMessage()));
|
||||
|
||||
}
|
||||
//TODO REFACTOR should put all of these exceptions behind a RegattaXMLReaderException.
|
||||
catch (IOException | SAXException | ParserConfigurationException e) {
|
||||
System.err.println("Error creating RegattaXMLReader: " + e.getMessage());
|
||||
//Continue to the next loop iteration/message.
|
||||
}
|
||||
|
||||
} else if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeRace) {
|
||||
//System.out.println("Setting Course");
|
||||
try {
|
||||
visualiserInput.getCourse().setStreamedCourseXMLReader(new StreamedCourseXMLReader(xmlMessage.getXmlMessage()));
|
||||
}
|
||||
//TODO REFACTOR should put all of these exceptions behind a StreamedCourseXMLReaderException.
|
||||
catch (IOException | SAXException | ParserConfigurationException | StreamedCourseXMLException e) {
|
||||
System.err.println("Error creating StreamedCourseXMLReader: " + e.getMessage());
|
||||
//Continue to the next loop iteration/message.
|
||||
}
|
||||
|
||||
} else if (xmlMessage.getXmlMsgSubType() == XMLMessage.XMLTypeBoat) {
|
||||
//System.out.println("Setting Boats");
|
||||
try {
|
||||
visualiserInput.getCourse().setBoatXMLReader(new BoatXMLReader(xmlMessage.getXmlMessage()));
|
||||
}
|
||||
//TODO REFACTOR should put all of these exceptions behind a BoatXMLReaderException.
|
||||
catch (IOException | SAXException | ParserConfigurationException e) {
|
||||
System.err.println("Error creating BoatXMLReader: " + e.getMessage());
|
||||
//Continue to the next loop iteration/message.
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
break;
|
||||
case RACESTARTSTATUS:
|
||||
//System.out.println("Race Start Status Message");
|
||||
break;
|
||||
case YACHTEVENTCODE:
|
||||
//System.out.println("Yacht Event Code!");
|
||||
//No decoder for this.
|
||||
break;
|
||||
case YACHTACTIONCODE:
|
||||
//System.out.println("Yacht Action Code!");
|
||||
//No decoder for this.
|
||||
break;
|
||||
case CHATTERTEXT:
|
||||
//System.out.println("Chatter Text Message!");
|
||||
//No decoder for this.
|
||||
break;
|
||||
case BOATLOCATION:
|
||||
BoatLocation location = (BoatLocation) message;
|
||||
|
||||
//System.out.println("Boat Location!");
|
||||
if (this.boatLocation.containsKey(location.getSourceID())) {
|
||||
//If our boatlocation map already contains a boat location message for this boat, check that the new message is actually for a later timestamp (i.e., newer).
|
||||
if (location.getTime() > this.boatLocation.get(location.getSourceID()).getTime()) {
|
||||
//If it is, replace the old message.
|
||||
this.boatLocation.put(location.getSourceID(), location);
|
||||
}
|
||||
} else {
|
||||
//If the map _doesn't_ already contain a message for this boat, insert the message.
|
||||
this.boatLocation.put(location.getSourceID(), location);
|
||||
}
|
||||
break;
|
||||
case MARKROUNDING:
|
||||
MarkRounding markRounding = (MarkRounding) message;
|
||||
|
||||
//System.out.println("Mark Rounding Message!");
|
||||
|
||||
if (this.markRoundingMap.containsKey(markRounding.getSourceID())) {
|
||||
//If our markRoundingMap already contains a mark rounding message for this boat, check that the new message is actually for a later timestamp (i.e., newer).
|
||||
if (markRounding.getTime() > this.markRoundingMap.get(markRounding.getSourceID()).getTime()) {
|
||||
//If it is, replace the old message.
|
||||
this.markRoundingMap.put(markRounding.getSourceID(), markRounding);
|
||||
}
|
||||
} else {
|
||||
//If the map _doesn't_ already contain a message for this boat, insert the message.
|
||||
this.markRoundingMap.put(markRounding.getSourceID(), markRounding);
|
||||
}
|
||||
break;
|
||||
case COURSEWIND:
|
||||
//System.out.println("Course Wind Message!");
|
||||
this.courseWinds = (CourseWinds) message;
|
||||
break;
|
||||
case AVGWIND:
|
||||
//System.out.println("Average Wind Message!");
|
||||
this.averageWind = (AverageWind) message;
|
||||
break;
|
||||
default:
|
||||
System.out.println("Broken Message!");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,208 +0,0 @@
|
||||
//package seng302.Model;
|
||||
//
|
||||
//import org.geotools.referencing.GeodeticCalculator;
|
||||
//import seng302.Constants;
|
||||
//import seng302.Controllers.RaceController;
|
||||
//import seng302.GPSCoordinate;
|
||||
//import seng302.RaceDataSource;
|
||||
//
|
||||
//import java.awt.geom.Point2D;
|
||||
//import java.util.ArrayList;
|
||||
//import java.util.Arrays;
|
||||
//import java.util.List;
|
||||
//import java.util.Random;
|
||||
//
|
||||
///**
|
||||
// * Created by cbt24 on 6/03/17.
|
||||
// *
|
||||
// * @deprecated
|
||||
// */
|
||||
//public class ConstantVelocityRace extends Race {
|
||||
//
|
||||
// private int dnfChance = 0; //%percentage chance a boat fails at each checkpoint
|
||||
//
|
||||
// /**
|
||||
// * Initializer for a constant velocity race without standard data source
|
||||
// *
|
||||
// * @param startingBoats in race
|
||||
// * @param legs in race
|
||||
// * @param controller for graphics
|
||||
// * @param scaleFactor of timer
|
||||
// */
|
||||
// public ConstantVelocityRace(List<BoatInRace> startingBoats, List<Leg> legs, RaceController controller, int scaleFactor) {
|
||||
// super(startingBoats, legs, controller, scaleFactor);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Initializer for legacy tests
|
||||
// *
|
||||
// * @param startingBoats in race
|
||||
// * @param legs in race
|
||||
// * @param controller for graphics
|
||||
// * @param scaleFactor of timer
|
||||
// *
|
||||
// * @deprecated Please use {@link #ConstantVelocityRace(List, List, RaceController, int) } for future tests.
|
||||
// */
|
||||
// public ConstantVelocityRace(BoatInRace[] startingBoats, List<Leg> legs, RaceController controller, int scaleFactor) {
|
||||
// super(Arrays.asList(startingBoats), legs, controller, scaleFactor);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Initializer for constant velocity race with standard data source
|
||||
// * @param raceData for race
|
||||
// * @param controller for graphics
|
||||
// * @param scaleFactor of timer
|
||||
// */
|
||||
// public ConstantVelocityRace(RaceDataSource raceData, RaceController controller, int scaleFactor) {
|
||||
// super(raceData, controller, scaleFactor);
|
||||
// }
|
||||
//
|
||||
// public void initialiseBoats() {
|
||||
// Leg officialStart = legs.get(0);
|
||||
// String name = officialStart.getName();
|
||||
// CompoundMark endMarker = officialStart.getEndCompoundMark();
|
||||
//
|
||||
// BoatInRace.setTrackPointTimeInterval(BoatInRace.getBaseTrackPointTimeInterval() / scaleFactor);
|
||||
//
|
||||
// ArrayList<CompoundMark> startMarkers = getSpreadStartingPositions();
|
||||
// for (int i = 0; i < startingBoats.size(); i++) {
|
||||
// BoatInRace boat = startingBoats.get(i);
|
||||
// if (boat != null) {
|
||||
// boat.setScaledVelocity(boat.getVelocity() * scaleFactor);
|
||||
// Leg startLeg = new Leg(name, 0);
|
||||
// boat.setCurrentPosition(startMarkers.get(i).getAverageGPSCoordinate());
|
||||
// startLeg.setStartCompoundMark(startMarkers.get(i));
|
||||
// startLeg.setEndCompoundMark(endMarker);
|
||||
// startLeg.calculateDistance();
|
||||
// boat.setCurrentLeg(startLeg);
|
||||
// boat.setHeading(boat.calculateHeading());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Creates a list of starting positions for the different boats, so they do not appear cramped at the start line
|
||||
// *
|
||||
// * @return list of starting positions
|
||||
// */
|
||||
// public ArrayList<CompoundMark> getSpreadStartingPositions() {
|
||||
//
|
||||
// int nBoats = startingBoats.size();
|
||||
// CompoundMark marker = legs.get(0).getStartCompoundMark();
|
||||
//
|
||||
// GeodeticCalculator initialCalc = new GeodeticCalculator();
|
||||
// initialCalc.setStartingGeographicPoint(marker.getMark1().getLongitude(), marker.getMark1().getLatitude());
|
||||
// initialCalc.setDestinationGeographicPoint(marker.getMark2().getLongitude(), marker.getMark2().getLatitude());
|
||||
//
|
||||
// double azimuth = initialCalc.getAzimuth();
|
||||
// double distanceBetweenMarkers = initialCalc.getOrthodromicDistance();
|
||||
// double distanceBetweenBoats = distanceBetweenMarkers / (nBoats + 1);
|
||||
//
|
||||
// GeodeticCalculator positionCalc = new GeodeticCalculator();
|
||||
// positionCalc.setStartingGeographicPoint(marker.getMark1().getLongitude(), marker.getMark1().getLatitude());
|
||||
// ArrayList<CompoundMark> positions = new ArrayList<>();
|
||||
//
|
||||
// for (int i = 0; i < nBoats; i++) {
|
||||
// positionCalc.setDirection(azimuth, distanceBetweenBoats);
|
||||
// Point2D position = positionCalc.getDestinationGeographicPoint();
|
||||
// positions.add(new CompoundMark(new GPSCoordinate(position.getY(), position.getX())));
|
||||
//
|
||||
// positionCalc = new GeodeticCalculator();
|
||||
// positionCalc.setStartingGeographicPoint(position);
|
||||
// }
|
||||
// return positions;
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Sets the chance each boat has of failing at a gate or marker
|
||||
// * @param chance percentage chance a boat has of failing per checkpoint.
|
||||
// */
|
||||
// protected void setDnfChance(int chance) {
|
||||
// if (chance >= 0 && chance <= 100) {
|
||||
// dnfChance = chance;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// protected boolean doNotFinish() {
|
||||
// Random rand = new Random();
|
||||
// return rand.nextInt(100) < dnfChance;
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Calculates the distance a boat has travelled and updates its current position according to this value.
|
||||
// *
|
||||
// * @param boat to be updated
|
||||
// * @param millisecondsElapsed since last update
|
||||
// */
|
||||
// protected void updatePosition(BoatInRace boat, int millisecondsElapsed) {
|
||||
//
|
||||
// //distanceTravelled = velocity (nm p hr) * time taken to update loop
|
||||
// double distanceTravelled = (boat.getScaledVelocity() * millisecondsElapsed) / 3600000;
|
||||
//
|
||||
// double totalDistanceTravelled = distanceTravelled + boat.getDistanceTravelledInLeg();
|
||||
//
|
||||
// boolean finish = boat.getCurrentLeg().getName().equals("Finish");
|
||||
// if (!finish) {
|
||||
// boat.setHeading(boat.calculateHeading());
|
||||
// //update boat's distance travelled
|
||||
// boat.setDistanceTravelledInLeg(totalDistanceTravelled);
|
||||
// //Calculate boat's new position by adding the distance travelled onto the start point of the leg
|
||||
// boat.setCurrentPosition(calculatePosition(boat.getCurrentLeg().getStartCompoundMark().getAverageGPSCoordinate(),
|
||||
// totalDistanceTravelled, boat.calculateAzimuth()));
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// protected void checkPosition(BoatInRace boat, long timeElapsed) {
|
||||
// if (boat.getDistanceTravelledInLeg() > boat.getCurrentLeg().getDistance()) {
|
||||
// //boat has passed onto new leg
|
||||
// if (boat.getCurrentLeg().getName().equals("Finish")) {
|
||||
// //boat has finished
|
||||
// boatsFinished++;
|
||||
// boat.setFinished(true);
|
||||
// boat.setTimeFinished(timeElapsed);
|
||||
// } else if (doNotFinish()) {
|
||||
// boatsFinished++;
|
||||
// boat.setFinished(true);
|
||||
// boat.setCurrentLeg(new Leg("DNF", -1));
|
||||
// boat.setVelocity(0);
|
||||
// boat.setScaledVelocity(0);
|
||||
// } else {
|
||||
// //Calculate how much the boat overshot the marker by
|
||||
// boat.setDistanceTravelledInLeg(boat.getDistanceTravelledInLeg() - boat.getCurrentLeg().getDistance());
|
||||
// //Move boat on to next leg
|
||||
// Leg nextLeg = legs.get(boat.getCurrentLeg().getLegNumber() + 1);
|
||||
//
|
||||
// boat.setCurrentLeg(nextLeg);
|
||||
// //Add overshoot distance into the distance travelled for the next leg
|
||||
// boat.setDistanceTravelledInLeg(boat.getDistanceTravelledInLeg());
|
||||
// }
|
||||
// //Update the boat display table in the GUI to reflect the leg change
|
||||
// updatePositions();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * Calculates the boats next GPS position based on its distance travelled and heading
|
||||
// *
|
||||
// * @param oldCoordinates GPS coordinates of the boat's starting position
|
||||
// * @param distanceTravelled distance in nautical miles
|
||||
// * @param azimuth boat's current direction. Value between -180 and 180
|
||||
// * @return The boat's new coordinate
|
||||
// */
|
||||
// public static GPSCoordinate calculatePosition(GPSCoordinate oldCoordinates, double distanceTravelled, double azimuth) {
|
||||
//
|
||||
// //Find new coordinate using current heading and distance
|
||||
//
|
||||
// GeodeticCalculator geodeticCalculator = new GeodeticCalculator();
|
||||
// //Load start point into calculator
|
||||
// Point2D startPoint = new Point2D.Double(oldCoordinates.getLongitude(), oldCoordinates.getLatitude());
|
||||
// geodeticCalculator.setStartingGeographicPoint(startPoint);
|
||||
// //load direction and distance tranvelled into calculator
|
||||
// geodeticCalculator.setDirection(azimuth, distanceTravelled * Constants.NMToMetersConversion);
|
||||
// //get new point
|
||||
// Point2D endPoint = geodeticCalculator.getDestinationGeographicPoint();
|
||||
//
|
||||
// return new GPSCoordinate(endPoint.getY(), endPoint.getX());
|
||||
// }
|
||||
//
|
||||
//}
|
||||
Loading…
Reference in new issue