michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated initialise boat function so it can now initialise boats with distance apart in meters.

Browse Source 
Created a second prototype function which is more testable compared to the initial design. New function takes in parameters (starting marks, yacht starting position, yacht) and initialise yacht correctly with position.

#story[1117]
This commit is contained in:
Zhi You Tan
2017-08-06 21:16:14 +12:00
parent 81c2a8e0fd
commit a470cb66a2
3 changed files with 93 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/gameServer/server/TestInitialiseBoatPosition.java
+34 -1
View File
@@ -3,13 +3,46 @@ package seng302.gameServer.server;
import static junit.framework.TestCase.assertTrue;
import org.junit.Test;
import seng302.gameServer.GameState;
import seng302.gameServer.MainServerThread;
import seng302.model.GeoPoint;
import seng302.model.Yacht;
import seng302.utilities.GeoUtility;
/**
* Created by ryantan on 5/08/2017.
*/
public class TestInitialiseBoatPosition {
private GeoPoint mark1 = new GeoPoint(50, 50);
private GeoPoint mark2 = new GeoPoint(0, 0);
private GameState gameState = new GameState("");
@Test
public void testInitialiseBoatPosition(){
// // Calculating midpoint
// Double perpendicularAngle = GeoUtility.getBearing(mark1, mark2);
// Double length = GeoUtility.getDistance(mark1, mark2);
// GeoPoint midpoint = GeoUtility.getGeoCoordinate(mark1, perpendicularAngle, length / 2);
//
// // Create 8 yacht in game state
// for (int i = 0; i < 8; i++) {
// GameState.addYacht(i, new Yacht("Yacht", i, "1", "Yacht" + i, "Yacht" + i, "Test" ));
// }
//
// int i = 0;
// for (Yacht yacht : GameState.getYachts().values()) {
// GameState.startBoatInPosition(mark1, mark2, i, yacht);
// double distance = GeoUtility.getDistance(midpoint, yacht.getLocation());
// System.out.println(i + " " + distance);
//
// double distanceApart = i / 2;
// if (i % 2 == 1 && i != 0) {
// distanceApart++;
// }
//
// assertTrue(distance <= (distanceApart * 50.01) && distance >= (distanceApart * 49.99));
// i++;
// }
}
}