quentinlegot/Othello
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix State.play(move) + move and fix evaluate from Negamax and AlphaBeta to Player

Browse Source
This commit is contained in:
Quentin Legot 2021-02-24 14:58:09 +01:00
parent ecf642de67
commit f673ed86fb
4 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/othello/State.java
View File

@ -78,20 +78,22 @@ public class State {
public State play(Pair<Point,Point> move) { public State play(Pair<Point,Point> move) {
State copy = this.copy(); State copy = this.copy();
if(move!=null) { boolean isJump = move.getLeft().isJump(move.getRight(), copy.board);
copy.board[move.getRight().getY()][move.getRight().getX()] = copy.currentPlayer; copy.board[move.getRight().getY()][move.getRight().getX()] = copy.currentPlayer;
if (move.getLeft().isJump(move.getRight(), copy.board)) { if (isJump) {
copy.board[move.getLeft().getY()][move.getLeft().getX()] = null; copy.board[move.getLeft().getY()][move.getLeft().getX()] = null;
} copy.board[(move.getLeft().getY() + move.getRight().getY()) / 2][(move.getLeft().getX() + move.getRight().getX()) / 2] = copy.currentPlayer;
} else {
for (int i = -1; i < 2; i++) { for (int i = -1; i < 2; i++) {
for (int z = -1; z < 2; z++) { for (int z = -1; z < 2; z++) {
try { try {
copy.board[move.getRight().getY() + i][move.getRight().getX() + z] = copy.currentPlayer; if(copy.board[move.getRight().getY() + i][move.getRight().getX() + z] != null)
} catch (IndexOutOfBoundsException ignored) { copy.board[move.getRight().getY() + i][move.getRight().getX() + z] = copy.currentPlayer;
} } catch (IndexOutOfBoundsException ignored) {}
} }
} }
} }
int ni = 0, nj = 0; int ni = 0, nj = 0;
for (Player[] players : copy.board) { for (Player[] players : copy.board) {
for (Player player : players) { for (Player player : players) {

8
src/othello/players/AlphaBetaPlayer.java
View File

@ -39,12 +39,4 @@ public class AlphaBetaPlayer extends Player{
return alpha; return alpha;
} }
} }
private int evaluate(State game){
Player winner = game.getWinner();
if(winner == null)
return 0;
else if(winner == game.getCurrentPlayer())
return -1;
return 1;
}
} }

8
src/othello/players/NegamaxPlayer.java
View File

@ -38,14 +38,6 @@ public class NegamaxPlayer extends Player {
return m; return m;
} }
} }
private int evaluate(State game){
Player winner = game.getWinner();
if(winner == null)
return 0;
else if(winner == game.getCurrentPlayer())
return -1;
return 1;
}
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {

9
src/othello/players/Player.java
View File

@ -14,4 +14,13 @@ public abstract class Player {
public abstract Pair<Point, Point> play(State board); public abstract Pair<Point, Point> play(State board);
protected int evaluate(State game){
Player winner = game.getWinner();
if(winner == null)
return 0;
else if(winner == game.getCurrentPlayer())
return 1;
return -1;
}
} }