Create XML object of boat data.
-XML object currently displaying out in terminal. -Reads in data from RaceDataSource. -TODO: Add sourceID to boats. #story[778]
This commit is contained in:
David Wu
@@ -1,140 +0,0 @@
|
||||
package seng302.Model;
|
||||
|
||||
|
||||
import javafx.scene.paint.Color;
|
||||
import org.geotools.referencing.GeodeticCalculator;
|
||||
import org.junit.Test;
|
||||
import seng302.Constants;
|
||||
import seng302.GPSCoordinate;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
/**
|
||||
* Created by esa46 on 16/03/17.
|
||||
*/
|
||||
public class ConstantVelocityRaceTest {
|
||||
/*
|
||||
Marker START_MARKER = new Marker(new GPSCoordinate(0, 0));
|
||||
Marker END_MARKER = new Marker(new GPSCoordinate(10, 10));
|
||||
Leg START_LEG = new Leg("Start", START_MARKER, END_MARKER, 0);
|
||||
|
||||
int ONE_HOUR = 3600000; //1 hour in milliseconds
|
||||
|
||||
|
||||
private ArrayList<Leg> generateLegsArray() {
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(START_LEG);
|
||||
return legs;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updatePositionChangesDistanceTravelled() {
|
||||
ArrayList<Leg> legs = generateLegsArray();
|
||||
BoatInRace boat = new BoatInRace("Test", 1, Color.ALICEBLUE, "tt");
|
||||
boat.setCurrentLeg(legs.get(0));
|
||||
boat.setDistanceTravelledInLeg(0);
|
||||
BoatInRace[] boats = new BoatInRace[]{boat};
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, null, 1);
|
||||
|
||||
race.updatePosition(boat, ONE_HOUR);
|
||||
assertEquals(boat.getDistanceTravelledInLeg(), boat.getVelocity(), 1e-8);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void updatePositionHandlesNoChangeToDistanceTravelled() {
|
||||
|
||||
ArrayList<Leg> legs = generateLegsArray();
|
||||
BoatInRace boat = new BoatInRace("Test", 0, Color.ALICEBLUE, "tt");
|
||||
boat.setCurrentLeg(legs.get(0));
|
||||
boat.setDistanceTravelledInLeg(0);
|
||||
BoatInRace[] boats = new BoatInRace[]{boat};
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, null, 1);
|
||||
|
||||
race.updatePosition(boat, ONE_HOUR);
|
||||
assertEquals(boat.getDistanceTravelledInLeg(), 0, 1e-8);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void changesToDistanceTravelledAreAdditive() {
|
||||
|
||||
ArrayList<Leg> legs = generateLegsArray();
|
||||
BoatInRace boat = new BoatInRace("Test", 5, Color.ALICEBLUE, "tt");
|
||||
boat.setCurrentLeg(legs.get(0));
|
||||
boat.setDistanceTravelledInLeg(50);
|
||||
BoatInRace[] boats = new BoatInRace[]{boat};
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, null, 1);
|
||||
|
||||
race.updatePosition(boat, ONE_HOUR);
|
||||
assertEquals(boat.getDistanceTravelledInLeg(), boat.getVelocity() + 50, 1e-8);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void travelling10nmNorthGivesCorrectNewCoordinates() {
|
||||
GPSCoordinate oldPos = new GPSCoordinate(0, 0);
|
||||
GPSCoordinate newPos = ConstantVelocityRace.calculatePosition(oldPos, 10, 0);
|
||||
|
||||
GeodeticCalculator calc = new GeodeticCalculator();
|
||||
calc.setStartingGeographicPoint(0, 0);
|
||||
calc.setDirection(0, 10 * Constants.NMToMetersConversion);
|
||||
|
||||
assertEquals(newPos.getLongitude(), 0, 1e-8);
|
||||
assertEquals(newPos.getLatitude(), calc.getDestinationGeographicPoint().getY(), 1e-8);
|
||||
assertEquals(newPos.getLongitude(), calc.getDestinationGeographicPoint().getX(), 1e-8);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void travelling10nmEastGivesCorrectNewCoordinates() {
|
||||
GPSCoordinate oldPos = new GPSCoordinate(0, 0);
|
||||
GPSCoordinate newPos = ConstantVelocityRace.calculatePosition(oldPos, 10, 90);
|
||||
|
||||
GeodeticCalculator calc = new GeodeticCalculator();
|
||||
calc.setStartingGeographicPoint(0, 0);
|
||||
calc.setDirection(90, 10 * Constants.NMToMetersConversion);
|
||||
|
||||
|
||||
assertEquals(newPos.getLatitude(), 0, 1e-8);
|
||||
assertEquals(newPos.getLatitude(), calc.getDestinationGeographicPoint().getY(), 1e-8);
|
||||
assertEquals(newPos.getLongitude(), calc.getDestinationGeographicPoint().getX(), 1e-8);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void travelling10nmWestGivesCorrectNewCoordinates() {
|
||||
GPSCoordinate oldPos = new GPSCoordinate(0, 0);
|
||||
GPSCoordinate newPos = ConstantVelocityRace.calculatePosition(oldPos, 10, -90);
|
||||
|
||||
GeodeticCalculator calc = new GeodeticCalculator();
|
||||
calc.setStartingGeographicPoint(0, 0);
|
||||
calc.setDirection(-90, 10 * Constants.NMToMetersConversion);
|
||||
|
||||
|
||||
assertEquals(newPos.getLatitude(), 0, 1e-8);
|
||||
assertEquals(newPos.getLatitude(), calc.getDestinationGeographicPoint().getY(), 1e-8);
|
||||
assertEquals(newPos.getLongitude(), calc.getDestinationGeographicPoint().getX(), 1e-8);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void travelling10nmSouthGivesCorrectNewCoordinates() {
|
||||
GPSCoordinate oldPos = new GPSCoordinate(0, 0);
|
||||
GPSCoordinate newPos = ConstantVelocityRace.calculatePosition(oldPos, 10, 180);
|
||||
|
||||
GeodeticCalculator calc = new GeodeticCalculator();
|
||||
calc.setStartingGeographicPoint(0, 0);
|
||||
calc.setDirection(180, 10 * Constants.NMToMetersConversion);
|
||||
|
||||
|
||||
assertEquals(newPos.getLongitude(), 0, 1e-8);
|
||||
assertEquals(newPos.getLatitude(), calc.getDestinationGeographicPoint().getY(), 1e-8);
|
||||
assertEquals(newPos.getLongitude(), calc.getDestinationGeographicPoint().getX(), 1e-8);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@@ -15,160 +15,159 @@ import static org.junit.Assert.assertTrue;
|
||||
* Created by esa46 on 15/03/17.
|
||||
*/
|
||||
public class RaceTest {
|
||||
/*
|
||||
|
||||
Leg START_LEG = new Leg("Start", new Marker(new GPSCoordinate(0, 0)), new Marker(new GPSCoordinate(1, 1)), 0);
|
||||
Leg FINISH_LEG = new Leg("Finish", new Marker(new GPSCoordinate(1, 1)), new Marker(new GPSCoordinate(2, 2)), 0);
|
||||
|
||||
@Ignore
|
||||
@Test
|
||||
public void timerCanBeDisabled() {
|
||||
BoatInRace boat1 = new BoatInRace("Test 1", 10000, Color.ALICEBLUE, "t1");
|
||||
BoatInRace boat2 = new BoatInRace("Test 2", 10000, Color.BURLYWOOD, "t2");
|
||||
BoatInRace[] boats = new BoatInRace[]{boat1, boat2};
|
||||
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(START_LEG); legs.add(FINISH_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, null, 5);
|
||||
race.disableTimer();
|
||||
race.setDnfChance(0);
|
||||
long timeStarted = System.currentTimeMillis();
|
||||
race.run();
|
||||
|
||||
assertTrue(System.currentTimeMillis() - timeStarted < 4000);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkPositionUpdatesNumberFinishedBoats() {
|
||||
|
||||
BoatInRace finishedBoat = new BoatInRace("Test", 1000, Color.ALICEBLUE, "tt");
|
||||
finishedBoat.setDistanceTravelledInLeg(500);
|
||||
|
||||
finishedBoat.setCurrentLeg(FINISH_LEG);
|
||||
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(FINISH_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
race.setDnfChance(0);
|
||||
assertEquals(race.boatsFinished, 0);
|
||||
|
||||
|
||||
race.checkPosition(finishedBoat, 100000);
|
||||
assertEquals(race.boatsFinished, 1);
|
||||
assertEquals(finishedBoat.getTimeFinished(), 100000);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkPositionDoesntUpdateNumberFinishedBoats() {
|
||||
|
||||
BoatInRace unFinishedBoat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt");
|
||||
unFinishedBoat.setDistanceTravelledInLeg(0);
|
||||
|
||||
unFinishedBoat.setCurrentLeg(FINISH_LEG);
|
||||
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(FINISH_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
race.setDnfChance(0);
|
||||
assertEquals(race.boatsFinished, 0);
|
||||
|
||||
race.checkPosition(unFinishedBoat, 100);
|
||||
assertEquals(race.boatsFinished, 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void distanceTravelledBeforeUpdatingLegIsRetained() {
|
||||
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
|
||||
|
||||
legs.add(START_LEG);
|
||||
legs.add(FINISH_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
race.setDnfChance(0);
|
||||
|
||||
BoatInRace unFinishedBoat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt");
|
||||
unFinishedBoat.setDistanceTravelledInLeg(100);
|
||||
unFinishedBoat.setCurrentLeg(START_LEG);
|
||||
|
||||
race.checkPosition(unFinishedBoat, 100);
|
||||
assertEquals(unFinishedBoat.getCurrentLeg().getName(), "Finish");
|
||||
assertTrue(unFinishedBoat.getDistanceTravelledInLeg() > 0);
|
||||
assertTrue(unFinishedBoat.getDistanceTravelledInLeg() < 100);
|
||||
|
||||
}
|
||||
|
||||
/*@Test
|
||||
|
||||
//Test temporarily removed as countdown timer now uses animation timer
|
||||
|
||||
public void timerDelaysByHalfSecond() {
|
||||
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(START_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
race.PRERACE_TIME = 500;
|
||||
|
||||
long timeStarted = System.currentTimeMillis();
|
||||
race.countdownTimer();
|
||||
|
||||
//assertTrue(System.currentTimeMillis() - timeStarted > 500);
|
||||
System.out.println(System.currentTimeMillis() - timeStarted);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void scalerScalesVelocityCorrectly() {
|
||||
|
||||
int scaleFactor = 3;
|
||||
float vel1 = 0;
|
||||
float vel2 = (float) 1.999;
|
||||
float vel3 = (float) 32.5;
|
||||
float vel4 = 500;
|
||||
BoatInRace boat1 = new BoatInRace("test", vel1, Color.ALICEBLUE, "tt");
|
||||
BoatInRace boat2 = new BoatInRace("test", vel2, Color.ALICEBLUE, "tt");
|
||||
BoatInRace boat3 = new BoatInRace("test", vel3, Color.ALICEBLUE, "tt");
|
||||
BoatInRace boat4 = new BoatInRace("test", vel4, Color.ALICEBLUE, "tt");
|
||||
BoatInRace[] boats = new BoatInRace[]{boat1, boat2, boat3, boat4};
|
||||
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(START_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, null, scaleFactor);
|
||||
race.setDnfChance(0);
|
||||
|
||||
assertEquals(race.getStartingBoats().get(0).getScaledVelocity(), vel1 * scaleFactor, 1e-6);
|
||||
assertEquals(race.getStartingBoats().get(1).getScaledVelocity(), vel2 * scaleFactor, 1e-6);
|
||||
assertEquals(race.getStartingBoats().get(2).getScaledVelocity(), vel3 * scaleFactor, 1e-6);
|
||||
assertEquals(race.getStartingBoats().get(3).getScaledVelocity(), vel4 * scaleFactor, 1e-6);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void scalerScalesRaceClockTo1MinCorrectly() {
|
||||
int scaleFactor = 10;
|
||||
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(START_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[5], legs, null, scaleFactor);
|
||||
race.totalTimeElapsed = 6000; //6 seconds
|
||||
assertTrue(race.calcTimer().equals("Race clock: 00:01:00"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void scalerScalesRaceClockHoursMinutesAndSecondsCorrectly() {
|
||||
int scaleFactor = 3;
|
||||
ArrayList<Leg> legs = new ArrayList<>();
|
||||
legs.add(START_LEG);
|
||||
|
||||
ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[5], legs, null, scaleFactor);
|
||||
race.totalTimeElapsed = 3213000;
|
||||
assertTrue(race.calcTimer().equals("Race clock: 02:40:39"));
|
||||
|
||||
}
|
||||
*/
|
||||
//
|
||||
// @Ignore
|
||||
// @Test
|
||||
// public void timerCanBeDisabled() {
|
||||
// BoatInRace boat1 = new BoatInRace("Test 1", 10000, Color.ALICEBLUE, "t1");
|
||||
// BoatInRace boat2 = new BoatInRace("Test 2", 10000, Color.BURLYWOOD, "t2");
|
||||
// BoatInRace[] boats = new BoatInRace[]{boat1, boat2};
|
||||
//
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
// legs.add(START_LEG); legs.add(FINISH_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, null, 5);
|
||||
// race.disableTimer();
|
||||
// race.setDnfChance(0);
|
||||
// long timeStarted = System.currentTimeMillis();
|
||||
// race.run();
|
||||
//
|
||||
// assertTrue(System.currentTimeMillis() - timeStarted < 4000);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void checkPositionUpdatesNumberFinishedBoats() {
|
||||
//
|
||||
// BoatInRace finishedBoat = new BoatInRace("Test", 1000, Color.ALICEBLUE, "tt");
|
||||
// finishedBoat.setDistanceTravelledInLeg(500);
|
||||
//
|
||||
// finishedBoat.setCurrentLeg(FINISH_LEG);
|
||||
//
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
// legs.add(FINISH_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
// race.setDnfChance(0);
|
||||
// assertEquals(race.boatsFinished, 0);
|
||||
//
|
||||
//
|
||||
// race.checkPosition(finishedBoat, 100000);
|
||||
// assertEquals(race.boatsFinished, 1);
|
||||
// assertEquals(finishedBoat.getTimeFinished(), 100000);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void checkPositionDoesntUpdateNumberFinishedBoats() {
|
||||
//
|
||||
// BoatInRace unFinishedBoat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt");
|
||||
// unFinishedBoat.setDistanceTravelledInLeg(0);
|
||||
//
|
||||
// unFinishedBoat.setCurrentLeg(FINISH_LEG);
|
||||
//
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
// legs.add(FINISH_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
// race.setDnfChance(0);
|
||||
// assertEquals(race.boatsFinished, 0);
|
||||
//
|
||||
// race.checkPosition(unFinishedBoat, 100);
|
||||
// assertEquals(race.boatsFinished, 0);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void distanceTravelledBeforeUpdatingLegIsRetained() {
|
||||
//
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
//
|
||||
//
|
||||
// legs.add(START_LEG);
|
||||
// legs.add(FINISH_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
// race.setDnfChance(0);
|
||||
//
|
||||
// BoatInRace unFinishedBoat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt");
|
||||
// unFinishedBoat.setDistanceTravelledInLeg(100);
|
||||
// unFinishedBoat.setCurrentLeg(START_LEG);
|
||||
//
|
||||
// race.checkPosition(unFinishedBoat, 100);
|
||||
// assertEquals(unFinishedBoat.getCurrentLeg().getName(), "Finish");
|
||||
// assertTrue(unFinishedBoat.getDistanceTravelledInLeg() > 0);
|
||||
// assertTrue(unFinishedBoat.getDistanceTravelledInLeg() < 100);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /*@Test
|
||||
//
|
||||
// //Test temporarily removed as countdown timer now uses animation timer
|
||||
//
|
||||
// public void timerDelaysByHalfSecond() {
|
||||
//
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
// legs.add(START_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[1], legs, null, 1);
|
||||
// race.PRERACE_TIME = 500;
|
||||
//
|
||||
// long timeStarted = System.currentTimeMillis();
|
||||
// race.countdownTimer();
|
||||
//
|
||||
// //assertTrue(System.currentTimeMillis() - timeStarted > 500);
|
||||
// System.out.println(System.currentTimeMillis() - timeStarted);
|
||||
//
|
||||
// }*/
|
||||
//
|
||||
// @Test
|
||||
// public void scalerScalesVelocityCorrectly() {
|
||||
//
|
||||
// int scaleFactor = 3;
|
||||
// float vel1 = 0;
|
||||
// float vel2 = (float) 1.999;
|
||||
// float vel3 = (float) 32.5;
|
||||
// float vel4 = 500;
|
||||
// BoatInRace boat1 = new BoatInRace("test", vel1, Color.ALICEBLUE, "tt");
|
||||
// BoatInRace boat2 = new BoatInRace("test", vel2, Color.ALICEBLUE, "tt");
|
||||
// BoatInRace boat3 = new BoatInRace("test", vel3, Color.ALICEBLUE, "tt");
|
||||
// BoatInRace boat4 = new BoatInRace("test", vel4, Color.ALICEBLUE, "tt");
|
||||
// BoatInRace[] boats = new BoatInRace[]{boat1, boat2, boat3, boat4};
|
||||
//
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
// legs.add(START_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, null, scaleFactor);
|
||||
// race.setDnfChance(0);
|
||||
//
|
||||
// assertEquals(race.getStartingBoats().get(0).getScaledVelocity(), vel1 * scaleFactor, 1e-6);
|
||||
// assertEquals(race.getStartingBoats().get(1).getScaledVelocity(), vel2 * scaleFactor, 1e-6);
|
||||
// assertEquals(race.getStartingBoats().get(2).getScaledVelocity(), vel3 * scaleFactor, 1e-6);
|
||||
// assertEquals(race.getStartingBoats().get(3).getScaledVelocity(), vel4 * scaleFactor, 1e-6);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void scalerScalesRaceClockTo1MinCorrectly() {
|
||||
// int scaleFactor = 10;
|
||||
//
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
// legs.add(START_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[5], legs, null, scaleFactor);
|
||||
// race.totalTimeElapsed = 6000; //6 seconds
|
||||
// assertTrue(race.calcTimer().equals("Race clock: 00:01:00"));
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void scalerScalesRaceClockHoursMinutesAndSecondsCorrectly() {
|
||||
// int scaleFactor = 3;
|
||||
// ArrayList<Leg> legs = new ArrayList<>();
|
||||
// legs.add(START_LEG);
|
||||
//
|
||||
// ConstantVelocityRace race = new ConstantVelocityRace(new BoatInRace[5], legs, null, scaleFactor);
|
||||
// race.totalTimeElapsed = 3213000;
|
||||
// assertTrue(race.calcTimer().equals("Race clock: 02:40:39"));
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user