@@ -1,12 +1,14 @@ package org.minesweeper; -public class Cell { +public final class Cell { private final int row; private final int column; + private final boolean isBomb; - public Cell(int row, int column) { + public Cell(int row, int column, boolean isBomb) { this.row = row; this.column = column; + this.isBomb = isBomb; } public int getRow() { @@ -17,9 +19,10 @@ public class Cell { return column; } + @Override public String toString() { - return "[" + row + "," + column + "]"; + return isBomb?"*":"."; } @Override @@ -27,6 +30,7 @@ public class Cell { final int prime = 31; int result = 1; result = prime * result + column; + result = prime * result + (isBomb ? 1231 : 1237); result = prime * result + row; return result; } @@ -39,12 +43,20 @@ public class Cell { return false; if (getClass() != obj.getClass()) return false; - Cell other = (Cell) obj; + final Cell other = (Cell) obj; if (column != other.column) return false; + if (isBomb != other.isBomb) + return false; if (row != other.row) return false; return true; } + public boolean isBomb() { + return isBomb; + } + + + } minesweeper_java/src/main/java/org/minesweeper/Cell.java @@ -5,50 +5,61 @@ import java.util.Set; public class Field { - private final String[][] field; + private final Cell[][] grid; public Field(int rows, int cols) { - field = new String[rows][]; + grid = new Cell[rows][]; for (int i = 0; i < rows; i++) { - String[] row = new String[cols]; + Cell[] row = new Cell[cols]; for (int j = 0; j < cols; j++) { - row[j] = "."; + row[j] = new Cell(i, j, false); } - field[i] = row; + grid[i] = row; } } - public String cellAt(int row, int column) { - return field[row][column]; + public Cell cellAt(int row, int column) { + return grid[row][column]; } public void placeBombAt(int row, int column) { - field[row][column] = "*"; + grid[row][column] = new Cell(row, column, true); } public Set<Cell> getNeighboursAt(int row, int col) { Set<Cell> result = new HashSet<Cell>(); - for (int rowIndex = row - 1; rowIndex <= row + 1; rowIndex++) { - if (rowIndex >= 0 && rowIndex < field.length) { - String[] currentRow = field[rowIndex]; - for (int colIndex = col - 1; colIndex <= col + 1; colIndex++) { - if (colIndex >= 0 && colIndex < currentRow.length) { - if (!(rowIndex == row && colIndex == col)) { - result.add(new Cell(rowIndex, colIndex)); - } - } - } + for (int rowIndex = Math.max(0, row - 1); rowIndex <= Math.min(row + 1, + getHeight() - 1); rowIndex++) { + result.addAll(getRowNeighbours(row, col, rowIndex)); + } + return result; + } + + private Set<Cell> getRowNeighbours(int row, int col, int rowIndex) { + Set<Cell> result = new HashSet<Cell>(); + for (int colIndex = Math.max(col - 1, 0); colIndex <= Math.min(col + 1, + getWidth() - 1); colIndex++) { + if (!(rowIndex == row && colIndex == col)) { + result.add(cellAt(rowIndex, colIndex)); } } return result; } - + + private int getWidth() { + return grid[0].length; + } + + private int getHeight() { + return grid.length; + } + @Override public String toString() { String result = ""; - for (String[] row : field) { + for (Cell[] row : grid) { result += "["; - for (String cell : row) { + for (Cell cell : row) { result += cell + " "; } result = result.substring(0, result.length() - 1); @@ -56,4 +67,14 @@ public class Field { } return result; } + + public int getNumberOfAdjacentBombsAt(int row, int col) { + int result = 0; + for (Cell cell : getNeighboursAt(row, col)) { + if (cell.isBomb()) { + result++; + } + } + return result; + } } minesweeper_java/src/main/java/org/minesweeper/Field.java @@ -12,20 +12,20 @@ public class FieldTest { @Test public void shouldStartEmpty() { Field unit = new Field(2, 2); - assertEquals(".", unit.cellAt(0, 0)); - assertEquals(".", unit.cellAt(0, 1)); - assertEquals(".", unit.cellAt(1, 0)); - assertEquals(".", unit.cellAt(1, 1)); + assertEquals(new Cell(0, 0, false), unit.cellAt(0, 0)); + assertEquals(new Cell(0, 1, false), unit.cellAt(0, 1)); + assertEquals(new Cell(1, 0, false), unit.cellAt(1, 0)); + assertEquals(new Cell(1, 1, false), unit.cellAt(1, 1)); } @Test public void shouldAllowPlacingBombs() { Field unit = new Field(2, 2); unit.placeBombAt(0, 1); - assertEquals(".", unit.cellAt(0, 0)); - assertEquals("*", unit.cellAt(0, 1)); - assertEquals(".", unit.cellAt(1, 0)); - assertEquals(".", unit.cellAt(1, 1)); + assertEquals(new Cell(0, 0, false), unit.cellAt(0, 0)); + assertEquals(new Cell(0, 1, true), unit.cellAt(0, 1)); + assertEquals(new Cell(1, 0, false), unit.cellAt(1, 0)); + assertEquals(new Cell(1, 1, false), unit.cellAt(1, 1)); } @Test @@ -34,42 +34,97 @@ public class FieldTest { unit.placeBombAt(0, 0); unit.placeBombAt(1, 0); unit.placeBombAt(2, 2); - assertEquals("[* . .]"+ - "[* . .]"+ - "[. . *]", unit.toString()); + assertEquals("[* . .]" + "[* . .]" + "[. . *]", unit.toString()); } - - + @Test public void shouldFindNeighbours() { Field unit = new Field(3, 3); Set<Cell> cells = unit.getNeighboursAt(1, 1); Set<Cell> expected = new HashSet<Cell>(); - expected.add(new Cell(0, 0)); - expected.add(new Cell(0, 1)); - expected.add(new Cell(0, 2)); - expected.add(new Cell(1, 0)); - expected.add(new Cell(1, 2)); - expected.add(new Cell(2, 0)); - expected.add(new Cell(2, 1)); - expected.add(new Cell(2, 2)); + expected.add(new Cell(0, 0, false)); + expected.add(new Cell(0, 1, false)); + expected.add(new Cell(0, 2, false)); + expected.add(new Cell(1, 0, false)); + expected.add(new Cell(1, 2, false)); + expected.add(new Cell(2, 0, false)); + expected.add(new Cell(2, 1, false)); + expected.add(new Cell(2, 2, false)); assertEquals(expected.size(), cells.size()); for (Cell expectedCell : expected) { assertTrue(cells.contains(expectedCell)); } } - + @Test public void shouldFindNeighboursAtCorner() { Field unit = new Field(3, 3); Set<Cell> cells = unit.getNeighboursAt(0, 0); Set<Cell> expected = new HashSet<Cell>(); - expected.add(new Cell(0, 1)); - expected.add(new Cell(1, 0)); - expected.add(new Cell(1, 1)); + expected.add(new Cell(0, 1, false)); + expected.add(new Cell(1, 0, false)); + expected.add(new Cell(1, 1, false)); assertEquals(expected.size(), cells.size()); for (Cell expectedCell : expected) { assertTrue(cells.contains(expectedCell)); } } + + @Test + public void shouldFindNeighboursAtBottomCorner() { + Field unit = new Field(3, 3); + Set<Cell> cells = unit.getNeighboursAt(2, 2); + Set<Cell> expected = new HashSet<Cell>(); + expected.add(new Cell(1, 2, false)); + expected.add(new Cell(1, 1, false)); + expected.add(new Cell(2, 1, false)); + assertEquals(expected.size(), cells.size()); + for (Cell expectedCell : expected) { + assertTrue(cells.contains(expectedCell)); + } + } + + @Test + public void shouldGetZeroAdjacentBombs() { + Field unit = new Field(3, 3); + int bombs = unit.getNumberOfAdjacentBombsAt(2, 2); + assertEquals(0, bombs); + } + + @Test + public void shouldGetNumberOfAdjacentBombs() { + Field unit = new Field(3, 3); + unit.placeBombAt(1, 1); + int bombs = unit.getNumberOfAdjacentBombsAt(2, 2); + assertEquals(1, bombs); + } + + @Test + public void shouldGetNumberOfAdjacentBombsOnARectangle() { + Field unit = new Field(6, 3); + unit.placeBombAt(5, 0); + int bombs = unit.getNumberOfAdjacentBombsAt(5, 1); + assertEquals(1, bombs); + } + + @Test + public void shouldGetMultipleAdjacentBombsOnARectangle() { + Field unit = new Field(6, 3); + unit.placeBombAt(5, 0); + unit.placeBombAt(5, 1); + unit.placeBombAt(5, 2); + int bombs = unit.getNumberOfAdjacentBombsAt(4, 1); + assertEquals(3, bombs); + } + + @Test + public void shouldIgnoreNonAdjacentBombsOnARectangle() { + Field unit = new Field(6, 7); + unit.placeBombAt(5, 0); + unit.placeBombAt(3, 3); + unit.placeBombAt(5, 2); + int bombs = unit.getNumberOfAdjacentBombsAt(4, 1); + assertEquals(2, bombs); + } + } minesweeper_java/src/test/java/org/minesweeper/FieldTest.java 2d498c4bee286fbcfb5505e02c2d84a45cb52fd8 Ivan Sanchez ivansanchez@sanchez.config http://github.com/codingdojolondon/sessions/commit/425137efa511540f30bac88ecda792803ace080c 425137efa511540f30bac88ecda792803ace080c 2009-03-26T11:54:45-07:00 2009-03-26T11:54:45-07:00 Minesweeper implementation generated at the Software Craftsmanship Conference 2009 (http://parlezuml.com/softwarecraftsmanship/sessions/5_reasons_to_have_a_coding_dojo.htm) 766170a937b16348ccc13e143f925685caa3db27 Ivan Sanchez ivansanchez@sanchez.config