- Removed some default templates (eg: created by X) - Wrote JavaDoc for classes that had none - Made JavaDoc more clear for classes - Linked JavaDoc to other classes - Minor spelling errors fixed - BoatInRace and BoatInRaceTest commented out (to be removed) #story[1003]main
Jessica McAuslin
9 years ago
parent
2bbcb10458
commit
cf0adb8511
@ -1,310 +1,311 @@
|
|||||||
package seng302.Model;
|
//package seng302.Model;
|
||||||
|
//
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
//import javafx.beans.property.SimpleStringProperty;
|
||||||
import javafx.beans.property.StringProperty;
|
//import javafx.beans.property.StringProperty;
|
||||||
import javafx.scene.paint.Color;
|
//import javafx.scene.paint.Color;
|
||||||
import org.geotools.referencing.GeodeticCalculator;
|
//import org.geotools.referencing.GeodeticCalculator;
|
||||||
import seng302.GPSCoordinate;
|
//import seng302.GPSCoordinate;
|
||||||
|
//
|
||||||
import java.awt.geom.Point2D;
|
//import java.awt.geom.Point2D;
|
||||||
import java.util.Queue;
|
//import java.util.Queue;
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
//import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* Boat in the Race extends Boat.
|
// * Boat in the Race extends {@link seng302.Model.Boat Boat}.
|
||||||
* Created by esa46 on 15/03/17.
|
// * The extended properties are related to the boats current race position.
|
||||||
*/
|
// * @See seng302.Model.Boat
|
||||||
public class BoatInRace extends Boat {
|
// */
|
||||||
|
//public class BoatInRace extends Boat {
|
||||||
private Leg currentLeg;
|
//
|
||||||
private double scaledVelocity;
|
// private Leg currentLeg;
|
||||||
private double distanceTravelledInLeg;
|
// private double scaledVelocity;
|
||||||
private GPSCoordinate currentPosition;
|
// private double distanceTravelledInLeg;
|
||||||
private long timeFinished;
|
// private GPSCoordinate currentPosition;
|
||||||
private Color colour;
|
// private long timeFinished;
|
||||||
private boolean finished = false;
|
// private Color colour;
|
||||||
private final StringProperty currentLegName;
|
// private boolean finished = false;
|
||||||
private boolean started = false;
|
// private final StringProperty currentLegName;
|
||||||
private final StringProperty position;
|
// private boolean started = false;
|
||||||
private double heading;
|
// private final StringProperty position;
|
||||||
private static final double WAKE_SCALE = 10;
|
// private double heading;
|
||||||
|
// private static final double WAKE_SCALE = 10;
|
||||||
private final Queue<TrackPoint> track = new ConcurrentLinkedQueue<>();
|
//
|
||||||
private long nextValidTime = 0;
|
// private final Queue<TrackPoint> track = new ConcurrentLinkedQueue<>();
|
||||||
|
// private long nextValidTime = 0;
|
||||||
private static final float BASE_TRACK_POINT_TIME_INTERVAL = 5000;
|
//
|
||||||
private static float trackPointTimeInterval = 5000; // every 1 seconds
|
// private static final float BASE_TRACK_POINT_TIME_INTERVAL = 5000;
|
||||||
|
// private static float trackPointTimeInterval = 5000; // every 1 seconds
|
||||||
/**
|
//
|
||||||
* Constructor method.
|
// /**
|
||||||
*
|
// * Constructor method.
|
||||||
* @param name Name of the boat.
|
// *
|
||||||
* @param velocity Speed that the boat travels.
|
// * @param name Name of the boat.
|
||||||
* @param colour Colour the boat will be displayed as on the map
|
// * @param velocity Speed that the boat travels.
|
||||||
* @param abbrev of boat
|
// * @param colour Colour the boat will be displayed as on the map
|
||||||
*/
|
// * @param abbrev of boat
|
||||||
public BoatInRace(String name, double velocity, Color colour, String abbrev) {
|
// */
|
||||||
super(name, velocity, abbrev);
|
// public BoatInRace(String name, double velocity, Color colour, String abbrev) {
|
||||||
setColour(colour);
|
// super(name, velocity, abbrev);
|
||||||
currentLegName = new SimpleStringProperty("");
|
// setColour(colour);
|
||||||
position = new SimpleStringProperty("-");
|
// currentLegName = new SimpleStringProperty("");
|
||||||
}
|
// position = new SimpleStringProperty("-");
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Calculates the azimuth of the travel via map coordinates of the raceMarkers
|
// /**
|
||||||
*
|
// * Calculates the azimuth of the travel via map coordinates of the raceMarkers
|
||||||
* @return the direction that the boat is heading towards in degrees (-180 to 180).
|
// *
|
||||||
*/
|
// * @return the direction that the boat is heading towards in degrees (-180 to 180).
|
||||||
public double calculateAzimuth() {
|
// */
|
||||||
|
// public double calculateAzimuth() {
|
||||||
GeodeticCalculator calc = new GeodeticCalculator();
|
//
|
||||||
GPSCoordinate start = currentLeg.getStartMarker().getAverageGPSCoordinate();
|
// GeodeticCalculator calc = new GeodeticCalculator();
|
||||||
GPSCoordinate end = currentLeg.getEndMarker().getAverageGPSCoordinate();
|
// GPSCoordinate start = currentLeg.getStartMarker().getAverageGPSCoordinate();
|
||||||
|
// GPSCoordinate end = currentLeg.getEndMarker().getAverageGPSCoordinate();
|
||||||
calc.setStartingGeographicPoint(start.getLongitude(), start.getLatitude());
|
//
|
||||||
calc.setDestinationGeographicPoint(end.getLongitude(), end.getLatitude());
|
// calc.setStartingGeographicPoint(start.getLongitude(), start.getLatitude());
|
||||||
|
// calc.setDestinationGeographicPoint(end.getLongitude(), end.getLatitude());
|
||||||
return calc.getAzimuth();
|
//
|
||||||
}
|
// return calc.getAzimuth();
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Converts an azimuth to a bearing
|
// /**
|
||||||
*
|
// * Converts an azimuth to a bearing
|
||||||
* @param azimuth azimuth value to be converted
|
// *
|
||||||
* @return the bearings in degrees (0 to 360).
|
// * @param azimuth azimuth value to be converted
|
||||||
*/
|
// * @return the bearings in degrees (0 to 360).
|
||||||
private static double calculateHeading(double azimuth) {
|
// */
|
||||||
if (azimuth >= 0) {
|
// private static double calculateHeading(double azimuth) {
|
||||||
return azimuth;
|
// if (azimuth >= 0) {
|
||||||
} else {
|
// return azimuth;
|
||||||
return azimuth + 360;
|
// } else {
|
||||||
}
|
// return azimuth + 360;
|
||||||
}
|
// }
|
||||||
|
// }
|
||||||
public double getHeading() {
|
//
|
||||||
return heading;
|
// public double getHeading() {
|
||||||
}
|
// return heading;
|
||||||
|
// }
|
||||||
public void setHeading(double heading) {
|
//
|
||||||
this.heading = heading;
|
// public void setHeading(double heading) {
|
||||||
}
|
// this.heading = heading;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Calculates the bearing of the travel via map coordinates of the raceMarkers
|
// /**
|
||||||
*
|
// * Calculates the bearing of the travel via map coordinates of the raceMarkers
|
||||||
* @return the direction that the boat is heading towards in degrees (0 to 360).
|
// *
|
||||||
*/
|
// * @return the direction that the boat is heading towards in degrees (0 to 360).
|
||||||
public double calculateHeading() {
|
// */
|
||||||
double azimuth = calculateAzimuth();
|
// public double calculateHeading() {
|
||||||
return calculateHeading(azimuth);
|
// double azimuth = calculateAzimuth();
|
||||||
}
|
// return calculateHeading(azimuth);
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Returns the position of the end of the boat's wake, which is 180 degrees
|
// /**
|
||||||
* from the boat's heading, and whose length is proportional to the boat's
|
// * Returns the position of the end of the boat's wake, which is 180 degrees
|
||||||
* speed.
|
// * from the boat's heading, and whose length is proportional to the boat's
|
||||||
*
|
// * speed.
|
||||||
* @return GPSCoordinate of wake endpoint.
|
// *
|
||||||
*/
|
// * @return GPSCoordinate of wake endpoint.
|
||||||
public GPSCoordinate getWake() {
|
// */
|
||||||
double reverseHeading = getHeading() - 180;
|
// public GPSCoordinate getWake() {
|
||||||
double distance = WAKE_SCALE * getVelocity();
|
// double reverseHeading = getHeading() - 180;
|
||||||
|
// double distance = WAKE_SCALE * getVelocity();
|
||||||
GeodeticCalculator calc = new GeodeticCalculator();
|
//
|
||||||
calc.setStartingGeographicPoint(
|
// GeodeticCalculator calc = new GeodeticCalculator();
|
||||||
new Point2D.Double(getCurrentPosition().getLongitude(), getCurrentPosition().getLatitude())
|
// calc.setStartingGeographicPoint(
|
||||||
);
|
// new Point2D.Double(getCurrentPosition().getLongitude(), getCurrentPosition().getLatitude())
|
||||||
calc.setDirection(reverseHeading, distance);
|
// );
|
||||||
Point2D endpoint = calc.getDestinationGeographicPoint();
|
// calc.setDirection(reverseHeading, distance);
|
||||||
return new GPSCoordinate(endpoint.getY(), endpoint.getX());
|
// Point2D endpoint = calc.getDestinationGeographicPoint();
|
||||||
}
|
// return new GPSCoordinate(endpoint.getY(), endpoint.getX());
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* @return Scaled velocity of the boat
|
// /**
|
||||||
*/
|
// * @return Scaled velocity of the boat
|
||||||
public double getScaledVelocity() {
|
// */
|
||||||
return scaledVelocity;
|
// public double getScaledVelocity() {
|
||||||
}
|
// return scaledVelocity;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Sets the boat's scaled velocity
|
// /**
|
||||||
*
|
// * Sets the boat's scaled velocity
|
||||||
* @param velocity of boat
|
// *
|
||||||
*/
|
// * @param velocity of boat
|
||||||
public void setScaledVelocity(double velocity) {
|
// */
|
||||||
this.scaledVelocity = velocity;
|
// public void setScaledVelocity(double velocity) {
|
||||||
}
|
// this.scaledVelocity = velocity;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* @return Returns the current position of the boat in a GPSCoordinate Class.
|
// /**
|
||||||
* @see GPSCoordinate
|
// * @return Returns the current position of the boat in a GPSCoordinate Class.
|
||||||
*/
|
// * @see GPSCoordinate
|
||||||
public GPSCoordinate getCurrentPosition() {
|
// */
|
||||||
return currentPosition;
|
// public GPSCoordinate getCurrentPosition() {
|
||||||
}
|
// return currentPosition;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Sets the current position on the GPS that the boat.
|
// /**
|
||||||
*
|
// * Sets the current position on the GPS that the boat.
|
||||||
* @param position GPSCoordinate of the position that the boat is currently on.
|
// *
|
||||||
* @see GPSCoordinate
|
// * @param position GPSCoordinate of the position that the boat is currently on.
|
||||||
*/
|
// * @see GPSCoordinate
|
||||||
public void setCurrentPosition(GPSCoordinate position) {
|
// */
|
||||||
this.currentPosition = position;
|
// public void setCurrentPosition(GPSCoordinate position) {
|
||||||
}
|
// this.currentPosition = position;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* @return Returns the time that the boat finished the race.
|
// /**
|
||||||
*/
|
// * @return Returns the time that the boat finished the race.
|
||||||
public long getTimeFinished() {
|
// */
|
||||||
return timeFinished;
|
// public long getTimeFinished() {
|
||||||
}
|
// return timeFinished;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Sets the time that the boat finished the race.
|
// /**
|
||||||
*
|
// * Sets the time that the boat finished the race.
|
||||||
* @param timeFinished Time the boat finished the race.
|
// *
|
||||||
*/
|
// * @param timeFinished Time the boat finished the race.
|
||||||
public void setTimeFinished(long timeFinished) {
|
// */
|
||||||
this.timeFinished = timeFinished;
|
// public void setTimeFinished(long timeFinished) {
|
||||||
}
|
// this.timeFinished = timeFinished;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* @return Returns the colour of the boat.
|
// /**
|
||||||
*/
|
// * @return Returns the colour of the boat.
|
||||||
public Color getColour() {
|
// */
|
||||||
return colour;
|
// public Color getColour() {
|
||||||
}
|
// return colour;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Sets the colour that boat will be shown as when drawn on the ResizableRaceCanvas.
|
// /**
|
||||||
*
|
// * Sets the colour that boat will be shown as when drawn on the ResizableRaceCanvas.
|
||||||
* @param colour Colour that the boat is to be set to.
|
// *
|
||||||
* @see ResizableRaceCanvas
|
// * @param colour Colour that the boat is to be set to.
|
||||||
*/
|
// * @see ResizableRaceCanvas
|
||||||
private void setColour(Color colour) {
|
// */
|
||||||
this.colour = colour;
|
// private void setColour(Color colour) {
|
||||||
}
|
// this.colour = colour;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Gets the current leg that the boat is on.
|
// /**
|
||||||
*
|
// * Gets the current leg that the boat is on.
|
||||||
* @return returns the leg the boat is on in a Leg class
|
// *
|
||||||
* @see Leg
|
// * @return returns the leg the boat is on in a Leg class
|
||||||
*/
|
// * @see Leg
|
||||||
public Leg getCurrentLeg() {
|
// */
|
||||||
return currentLeg;
|
// public Leg getCurrentLeg() {
|
||||||
}
|
// return currentLeg;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Sets the boat's current leg.
|
// /**
|
||||||
*
|
// * Sets the boat's current leg.
|
||||||
* @param currentLeg Leg class that the boat is currently on.
|
// *
|
||||||
* @see Leg
|
// * @param currentLeg Leg class that the boat is currently on.
|
||||||
*/
|
// * @see Leg
|
||||||
public void setCurrentLeg(Leg currentLeg) {
|
// */
|
||||||
this.currentLeg = currentLeg;
|
// public void setCurrentLeg(Leg currentLeg) {
|
||||||
this.currentLegName.setValue(currentLeg.getName());
|
// this.currentLeg = currentLeg;
|
||||||
}
|
// this.currentLegName.setValue(currentLeg.getName());
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* @return Name of boat's current leg
|
// /**
|
||||||
*/
|
// * @return Name of boat's current leg
|
||||||
public StringProperty getCurrentLegName() {
|
// */
|
||||||
return currentLegName;
|
// public StringProperty getCurrentLegName() {
|
||||||
}
|
// return currentLegName;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Gets the distance travelled by the boat in the leg.
|
// /**
|
||||||
*
|
// * Gets the distance travelled by the boat in the leg.
|
||||||
* @return Returns the value in nautical miles (1.852km) that the boat has traversed.
|
// *
|
||||||
*/
|
// * @return Returns the value in nautical miles (1.852km) that the boat has traversed.
|
||||||
public double getDistanceTravelledInLeg() {
|
// */
|
||||||
return distanceTravelledInLeg;
|
// public double getDistanceTravelledInLeg() {
|
||||||
}
|
// return distanceTravelledInLeg;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Sets the distance travelled by the boat in the leg in nautical miles (1.852km)
|
// /**
|
||||||
*
|
// * Sets the distance travelled by the boat in the leg in nautical miles (1.852km)
|
||||||
* @param distanceTravelledInLeg Distance travelled by the boat in nautical miles.
|
// *
|
||||||
*/
|
// * @param distanceTravelledInLeg Distance travelled by the boat in nautical miles.
|
||||||
public void setDistanceTravelledInLeg(double distanceTravelledInLeg) {
|
// */
|
||||||
this.distanceTravelledInLeg = distanceTravelledInLeg;
|
// public void setDistanceTravelledInLeg(double distanceTravelledInLeg) {
|
||||||
}
|
// this.distanceTravelledInLeg = distanceTravelledInLeg;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* @return true if boat has finished, false if not
|
// /**
|
||||||
*/
|
// * @return true if boat has finished, false if not
|
||||||
public boolean isFinished() {
|
// */
|
||||||
return this.finished;
|
// public boolean isFinished() {
|
||||||
}
|
// return this.finished;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Sets whether boat is finished or not
|
// /**
|
||||||
*
|
// * Sets whether boat is finished or not
|
||||||
* @param bool is finished value
|
// *
|
||||||
*/
|
// * @param bool is finished value
|
||||||
public void setFinished(boolean bool) {
|
// */
|
||||||
this.finished = bool;
|
// public void setFinished(boolean bool) {
|
||||||
}
|
// this.finished = bool;
|
||||||
|
// }
|
||||||
public boolean isStarted() {
|
//
|
||||||
return started;
|
// public boolean isStarted() {
|
||||||
}
|
// return started;
|
||||||
|
// }
|
||||||
public void setStarted(boolean started) {
|
//
|
||||||
this.started = started;
|
// public void setStarted(boolean started) {
|
||||||
}
|
// this.started = started;
|
||||||
|
// }
|
||||||
public String getPosition() {
|
//
|
||||||
return position.get();
|
// public String getPosition() {
|
||||||
}
|
// return position.get();
|
||||||
|
// }
|
||||||
public StringProperty positionProperty() {
|
//
|
||||||
return position;
|
// public StringProperty positionProperty() {
|
||||||
}
|
// return position;
|
||||||
|
// }
|
||||||
public void setPosition(String position) {
|
//
|
||||||
this.position.set(position);
|
// public void setPosition(String position) {
|
||||||
}
|
// this.position.set(position);
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Adds a new point to boat's track.
|
// /**
|
||||||
* @param coordinate of point on track
|
// * Adds a new point to boat's track.
|
||||||
* @see seng302.Model.TrackPoint
|
// * @param coordinate of point on track
|
||||||
*/
|
// * @see seng302.Model.TrackPoint
|
||||||
public void addTrackPoint(GPSCoordinate coordinate) {
|
// */
|
||||||
Boolean added = System.currentTimeMillis() >= nextValidTime;
|
// public void addTrackPoint(GPSCoordinate coordinate) {
|
||||||
long currentTime = System.currentTimeMillis();
|
// Boolean added = System.currentTimeMillis() >= nextValidTime;
|
||||||
if (added && this.started) {
|
// long currentTime = System.currentTimeMillis();
|
||||||
nextValidTime = currentTime + (long) trackPointTimeInterval;
|
// if (added && this.started) {
|
||||||
int TRACK_POINT_LIMIT = 10;
|
// nextValidTime = currentTime + (long) trackPointTimeInterval;
|
||||||
track.add(new TrackPoint(coordinate, currentTime, TRACK_POINT_LIMIT * (long) trackPointTimeInterval));
|
// int TRACK_POINT_LIMIT = 10;
|
||||||
}
|
// track.add(new TrackPoint(coordinate, currentTime, TRACK_POINT_LIMIT * (long) trackPointTimeInterval));
|
||||||
}
|
// }
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Returns the boat's sampled track between start of race and current time.
|
// /**
|
||||||
* @return queue of track points
|
// * Returns the boat's sampled track between start of race and current time.
|
||||||
* @see seng302.Model.TrackPoint
|
// * @return queue of track points
|
||||||
*/
|
// * @see seng302.Model.TrackPoint
|
||||||
public Queue<TrackPoint> getTrack() {
|
// */
|
||||||
return track;
|
// public Queue<TrackPoint> getTrack() {
|
||||||
}
|
// return track;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Get base track point time interval
|
// /**
|
||||||
* @return base track point time interval
|
// * Get base track point time interval
|
||||||
*/
|
// * @return base track point time interval
|
||||||
public static float getBaseTrackPointTimeInterval() {
|
// */
|
||||||
return BASE_TRACK_POINT_TIME_INTERVAL;
|
// public static float getBaseTrackPointTimeInterval() {
|
||||||
}
|
// return BASE_TRACK_POINT_TIME_INTERVAL;
|
||||||
|
// }
|
||||||
/**
|
//
|
||||||
* Set track point time interval
|
// /**
|
||||||
* @param value track point time interval value
|
// * Set track point time interval
|
||||||
*/
|
// * @param value track point time interval value
|
||||||
public static void setTrackPointTimeInterval(float value) {
|
// */
|
||||||
trackPointTimeInterval = value;
|
// public static void setTrackPointTimeInterval(float value) {
|
||||||
}
|
// trackPointTimeInterval = value;
|
||||||
}
|
// }
|
||||||
|
//}
|
||||||
|
|||||||
@ -1,154 +1,149 @@
|
|||||||
package seng302.Model;
|
package seng302.Model;
|
||||||
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import org.junit.Test;
|
|
||||||
import seng302.GPSCoordinate;
|
|
||||||
|
|
||||||
import static junit.framework.TestCase.*;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by esa46 on 22/03/17.
|
* Tests various aspects of a boat in race perform correctly.
|
||||||
*/
|
*/
|
||||||
public class BoatInRaceTest {
|
public class BoatInRaceTest {
|
||||||
|
// TODO change this test to use Boat and not BoatInRace ??
|
||||||
|
// TODO delete BoatInRace class
|
||||||
private final GPSCoordinate ORIGIN_COORDS = new GPSCoordinate(0, 0);
|
|
||||||
private final BoatInRace TEST_BOAT = new BoatInRace("Test", 1, Color.ALICEBLUE, "tt");
|
// private final GPSCoordinate ORIGIN_COORDS = new GPSCoordinate(0, 0);
|
||||||
|
// private final BoatInRace TEST_BOAT = new BoatInRace("Test", 1, Color.ALICEBLUE, "tt");
|
||||||
|
//
|
||||||
@Test
|
//
|
||||||
public void calculateDueNorthAzimuthReturns0() {
|
// @Test
|
||||||
|
// public void calculateDueNorthAzimuthReturns0() {
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
//
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateAzimuth(), 0, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
}
|
// assertEquals(TEST_BOAT.calculateAzimuth(), 0, 1e-8);
|
||||||
|
// }
|
||||||
@Test
|
//
|
||||||
public void calculateDueSouthAzimuthReturns180() {
|
// @Test
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
// public void calculateDueSouthAzimuthReturns180() {
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(-50, 0));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(-50, 0));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateAzimuth(), 180, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
}
|
// assertEquals(TEST_BOAT.calculateAzimuth(), 180, 1e-8);
|
||||||
|
// }
|
||||||
|
//
|
||||||
@Test
|
//
|
||||||
public void calculateDueEastAzimuthReturns90() {
|
// @Test
|
||||||
|
// public void calculateDueEastAzimuthReturns90() {
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
//
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(0, 50));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(0, 50));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateAzimuth(), 90, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
}
|
// assertEquals(TEST_BOAT.calculateAzimuth(), 90, 1e-8);
|
||||||
|
// }
|
||||||
|
//
|
||||||
@Test
|
//
|
||||||
public void calculateDueWestAzimuthReturnsNegative90() {
|
// @Test
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
// public void calculateDueWestAzimuthReturnsNegative90() {
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(0, -50));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(0, -50));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateAzimuth(), -90, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
|
// assertEquals(TEST_BOAT.calculateAzimuth(), -90, 1e-8);
|
||||||
}
|
//
|
||||||
|
// }
|
||||||
@Test
|
//
|
||||||
public void calculateDueNorthHeadingReturns0() {
|
// @Test
|
||||||
|
// public void calculateDueNorthHeadingReturns0() {
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
//
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateHeading(), 0, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
}
|
// assertEquals(TEST_BOAT.calculateHeading(), 0, 1e-8);
|
||||||
|
// }
|
||||||
|
//
|
||||||
@Test
|
//
|
||||||
public void calculateDueEastHeadingReturns90() {
|
// @Test
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
// public void calculateDueEastHeadingReturns90() {
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(0, 50));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(0, 50));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateHeading(), 90, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
}
|
// assertEquals(TEST_BOAT.calculateHeading(), 90, 1e-8);
|
||||||
|
// }
|
||||||
@Test
|
//
|
||||||
public void calculateDueSouthHeadingReturns180() {
|
// @Test
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
// public void calculateDueSouthHeadingReturns180() {
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(-50, 0));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(-50, 0));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateHeading(), 180, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
}
|
// assertEquals(TEST_BOAT.calculateHeading(), 180, 1e-8);
|
||||||
|
// }
|
||||||
@Test
|
//
|
||||||
public void calculateDueWestHeadingReturns270() {
|
// @Test
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
// public void calculateDueWestHeadingReturns270() {
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(0, -50));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg start = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(0, -50));
|
||||||
TEST_BOAT.setCurrentLeg(start);
|
// Leg start = new Leg("Start", startMarker, endMarker, 0);
|
||||||
assertEquals(TEST_BOAT.calculateHeading(), 270, 1e-8);
|
// TEST_BOAT.setCurrentLeg(start);
|
||||||
}
|
// assertEquals(TEST_BOAT.calculateHeading(), 270, 1e-8);
|
||||||
|
// }
|
||||||
@Test
|
//
|
||||||
public void createNewBoatCratesInstanceOfSuperClass() {
|
// @Test
|
||||||
|
// public void createNewBoatCratesInstanceOfSuperClass() {
|
||||||
BoatInRace testBoat = new BoatInRace("Boat", 20, Color.ALICEBLUE, "tt");
|
//
|
||||||
testBoat.setName("Name can change");
|
// BoatInRace testBoat = new BoatInRace("Boat", 20, Color.ALICEBLUE, "tt");
|
||||||
assertTrue(testBoat instanceof Boat);
|
// testBoat.setName("Name can change");
|
||||||
assertTrue(testBoat.getCurrentLeg() == null);
|
// assertTrue(testBoat instanceof Boat);
|
||||||
assertTrue(testBoat.getCurrentPosition() == null);
|
// assertTrue(testBoat.getCurrentLeg() == null);
|
||||||
assertTrue(testBoat.toString().contains("Name can change"));
|
// assertTrue(testBoat.getCurrentPosition() == null);
|
||||||
assertEquals(testBoat.getVelocity(), 20.0);
|
// assertTrue(testBoat.toString().contains("Name can change"));
|
||||||
assertTrue(testBoat.getVelocityProp().toString().contains("20"));
|
// assertEquals(testBoat.getVelocity(), 20.0);
|
||||||
assertTrue(testBoat.getAbbrev().equals("tt"));
|
// assertTrue(testBoat.getVelocityProp().toString().contains("20"));
|
||||||
assertTrue(testBoat.getColour().equals(Color.ALICEBLUE));
|
// assertTrue(testBoat.getAbbrev().equals("tt"));
|
||||||
assertFalse(testBoat.isFinished());
|
// assertTrue(testBoat.getColour().equals(Color.ALICEBLUE));
|
||||||
}
|
// assertFalse(testBoat.isFinished());
|
||||||
|
// }
|
||||||
|
//
|
||||||
@Test
|
//
|
||||||
public void getWakeAtProperHeading() throws Exception {
|
// @Test
|
||||||
BoatInRace boat = new BoatInRace("Test", 1, Color.ALICEBLUE, "tt");
|
// public void getWakeAtProperHeading() throws Exception {
|
||||||
|
// BoatInRace boat = new BoatInRace("Test", 1, Color.ALICEBLUE, "tt");
|
||||||
// Construct leg of 0 degrees
|
//
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
// // Construct leg of 0 degrees
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg leg0deg = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
||||||
boat.setCurrentLeg(leg0deg);
|
// Leg leg0deg = new Leg("Start", startMarker, endMarker, 0);
|
||||||
boat.setCurrentPosition(new GPSCoordinate(0, 0));
|
// boat.setCurrentLeg(leg0deg);
|
||||||
|
// boat.setCurrentPosition(new GPSCoordinate(0, 0));
|
||||||
assertEquals(0, boat.calculateHeading(), 1e-8);
|
//
|
||||||
|
// assertEquals(0, boat.calculateHeading(), 1e-8);
|
||||||
// Construct leg from wake - heading should be 180 degrees
|
//
|
||||||
Leg leg180deg = new Leg("Start", startMarker, new Marker(boat.getWake()), 0);
|
// // Construct leg from wake - heading should be 180 degrees
|
||||||
boat.setCurrentLeg(leg180deg);
|
// Leg leg180deg = new Leg("Start", startMarker, new Marker(boat.getWake()), 0);
|
||||||
|
// boat.setCurrentLeg(leg180deg);
|
||||||
assertEquals(180, boat.calculateHeading(), 1e-8);
|
//
|
||||||
}
|
// assertEquals(180, boat.calculateHeading(), 1e-8);
|
||||||
|
// }
|
||||||
|
//
|
||||||
@Test
|
//
|
||||||
public void getWakeProportionalToVelocity() throws Exception {
|
// @Test
|
||||||
BoatInRace boat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt");
|
// public void getWakeProportionalToVelocity() throws Exception {
|
||||||
|
// BoatInRace boat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt");
|
||||||
// Construct leg of 0 degrees at 0 N
|
//
|
||||||
Marker startMarker = new Marker(ORIGIN_COORDS);
|
// // Construct leg of 0 degrees at 0 N
|
||||||
Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
// Marker startMarker = new Marker(ORIGIN_COORDS);
|
||||||
Leg leg0deg = new Leg("Start", startMarker, endMarker, 0);
|
// Marker endMarker = new Marker(new GPSCoordinate(50, 0));
|
||||||
boat.setCurrentLeg(leg0deg);
|
// Leg leg0deg = new Leg("Start", startMarker, endMarker, 0);
|
||||||
boat.setCurrentPosition(new GPSCoordinate(0, 0));
|
// boat.setCurrentLeg(leg0deg);
|
||||||
|
// boat.setCurrentPosition(new GPSCoordinate(0, 0));
|
||||||
// Get latitude of endpoint of wake at 10 kn (longitude is 0)
|
//
|
||||||
double endpointAt10Kn = boat.getWake().getLatitude();
|
// // Get latitude of endpoint of wake at 10 kn (longitude is 0)
|
||||||
|
// double endpointAt10Kn = boat.getWake().getLatitude();
|
||||||
// Latitude of endpoint at 20 kn should be twice endpoint at 10 kn
|
//
|
||||||
boat.setVelocity(20);
|
// // Latitude of endpoint at 20 kn should be twice endpoint at 10 kn
|
||||||
assertEquals(2 * endpointAt10Kn, boat.getWake().getLatitude(), 1e-8);
|
// boat.setVelocity(20);
|
||||||
}
|
// assertEquals(2 * endpointAt10Kn, boat.getWake().getLatitude(), 1e-8);
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
Loading…
Reference in new issue