diff --git a/.gitignore b/.gitignore index 3037395..9be63c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,5 @@ bin - build - classes - dist - -docs - -player.txt -DetailedInfo.txt -DetailedInfo.xml -*.png \ No newline at end of file +doc diff --git a/res/img/blue.png b/res/img/blue.png new file mode 100644 index 0000000..f1eb446 Binary files /dev/null and b/res/img/blue.png differ diff --git a/res/img/green.png b/res/img/green.png new file mode 100644 index 0000000..fe1b4fb Binary files /dev/null and b/res/img/green.png differ diff --git a/res/img/none.png b/res/img/none.png new file mode 100644 index 0000000..482d3ad Binary files /dev/null and b/res/img/none.png differ diff --git a/res/img/red.png b/res/img/red.png new file mode 100644 index 0000000..54f8e4f Binary files /dev/null and b/res/img/red.png differ diff --git a/res/img/yellow.png b/res/img/yellow.png new file mode 100644 index 0000000..7ed3687 Binary files /dev/null and b/res/img/yellow.png differ diff --git a/src/model/Board.java b/src/model/Board.java index 32666bb..5cf31af 100644 --- a/src/model/Board.java +++ b/src/model/Board.java @@ -18,7 +18,8 @@ public class Board { private int numPlies = 0; public Board(Board that) { - this(); + board = new TileColor[NUM_ROWS][NUM_COLS]; + for (int i = 0; i < NUM_COLS; i++) { for (int j = 0; j < NUM_ROWS; j++) { this.board[j][i] = that.board[j][i]; diff --git a/src/player/generator/AlphaBetaMoveGenerator.java b/src/player/generator/AlphaBetaMoveGenerator.java index 8da6ab2..79ffa75 100644 --- a/src/player/generator/AlphaBetaMoveGenerator.java +++ b/src/player/generator/AlphaBetaMoveGenerator.java @@ -12,7 +12,7 @@ import org.apache.log4j.Logger; public class AlphaBetaMoveGenerator implements MoveGenerator { private static final Logger LOGGER = Logger .getLogger(AlphaBetaMoveGenerator.class.getName()); - private static final int DEFAULT_RECURSIVE_PLAYS = 2; + private static final int DEFAULT_RECURSIVE_PLAYS = 3; private final BoardScorer scorer = new BoardScorer(); private final ValidMoveGenerator validMoveGenerator = new ValidMoveGenerator(); diff --git a/src/player/generator/ValidMoveGenerator.java b/src/player/generator/ValidMoveGenerator.java index cc10c05..9fa16f7 100644 --- a/src/player/generator/ValidMoveGenerator.java +++ b/src/player/generator/ValidMoveGenerator.java @@ -27,8 +27,11 @@ public class ValidMoveGenerator implements MoveGenerator { for (int j = 0; j < Board.NUM_COLS; j++) { if (board.getTile(i, j) == TileColor.NONE) { for (TileColor color : TileColor.values()) { + if (color == TileColor.NONE) { + continue; + } validMoves.add(new Move(color, i, j)); - } + } } } }