[Ch6] GameHelper: Although it's not as efficient, creating a proposed set of... (bcaecf54) · Commits · examples / Head First Java 3rd Edition

src/main/java/ch6/GameHelper.java

+10 −19

Changes for src/main/java/ch6/GameHelper.java: 10 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -36,16 +36,15 @@ public class GameHelper {

		while (!success & attempts++ < MAX_ATTEMPTS) { // main search loop (32)
		int location = random.nextInt(GRID_SIZE); // get random starting point
		boolean validLocation = isValidLocation(location, startupSize, alignment); // check the startup would fit on the grid

		if (validLocation) { // if it fits....
		for (int i = 0; i < startupCoords.length; i++) { // create an array of proposed co-ordinates for the startup
		startupCoords[i] = location;
		location += alignment.getIncrement(); // calculate the next location
		}
		System.out.println("trying: " + Arrays.toString(startupCoords));
		System.out.println("Trying: " + Arrays.toString(startupCoords));

		success = coordsAvailable(startupCoords);
		if (startupFits(startupCoords, alignment)) { // check the startup would fit on the grid
		success = coordsAvailable(startupCoords); // if it fits, check those locations aren't taken
		} // end loop
		} // end while

		@@ -56,20 +55,19 @@ public class GameHelper {
		return alphaCells;
		}

		private boolean isValidLocation(int location, int startupSize, Alignment alignment) {
		int finalLocation = location + (alignment.getIncrement() * startupSize);
		boolean startupFits(int[] startupCoords, Alignment alignment) {
		int finalLocation = startupCoords[startupCoords.length - 1];
		if (alignment == HORIZONTAL) {
		return horizontalStartupFits(location, finalLocation);
		return calculateRowFromIndex(startupCoords[0]) == calculateRowFromIndex(finalLocation); // check end is on same row as start
		} else {
		return verticalStartupFits(finalLocation);
		return finalLocation < GRID_SIZE; // check end position doesn't go off the bottom of the grid
		}
		}

		private ArrayList<String> convertCoordsToAlphaFormat(int[] startupCoords) {
		ArrayList<String> alphaCells = new ArrayList<String>();
		for (int index : startupCoords) { // turn location into 'a0'-style startupCoords
		String alphaCoords = getAlphaCoordsFromIndex(index);
		alphaCells.add(alphaCoords);
		for (int index : startupCoords) { // for each grid coordinate
		alphaCells.add(getAlphaCoordsFromIndex(index)); // turn it into an "a0" style and add to a list
		}
		return alphaCells;
		}
		@@ -91,20 +89,13 @@ public class GameHelper {
		boolean coordsAvailable(int[] startupCoords) {
		for (int coord : startupCoords) { // check all potential positions
		if (grid[coord] != 0) { // this co-ordinate already has an entry in the grid
		System.out.println("position: " + coord + " already taken.");
		return false; // NO success
		}
		}
		return true; // if the method got this far, there were no clashes, yay!
		}

		boolean horizontalStartupFits(int location, int finalLocation) {
		return calculateRowFromIndex(location) == calculateRowFromIndex(finalLocation); // check end is on same row as start
		}

		boolean verticalStartupFits(int finalLocation) {
		return finalLocation < GRID_SIZE; // check end position doesn't go off the bottom of the grid
		}

		private Alignment getAlignment() {
		if (startupCount % 2 == 0) { // if EVEN Startup
		return HORIZONTAL; // place horizontally

src/test/java/ch6/GameHelperTest.java

+3 −3

Changes for src/test/java/ch6/GameHelperTest.java: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ class GameHelperTest {
		GameHelper gameHelper = new GameHelper();

		// expect
		assertFalse(gameHelper.horizontalStartupFits(26, 26 + (HORIZONTAL.getIncrement() * 3)));
		assertFalse(gameHelper.startupFits(new int[]{26, 27, 28}, HORIZONTAL));
		}

		@Test
		@@ -56,7 +56,7 @@ class GameHelperTest {
		GameHelper gameHelper = new GameHelper();

		// expect
		assertTrue(gameHelper.verticalStartupFits(26 + (VERTICAL.getIncrement() * 3)));
		assertTrue(gameHelper.startupFits(new int[]{26, 33, 40}, VERTICAL));
		}

		@Test
		@@ -65,7 +65,7 @@ class GameHelperTest {
		GameHelper gameHelper = new GameHelper();

		// expect
		assertFalse(gameHelper.verticalStartupFits(47 + (VERTICAL.getIncrement() * 3)));
		assertFalse(gameHelper.startupFits(new int[]{47, 54, 61}, VERTICAL));
		}

		@Test