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

renamed somes files + refactored State constructors

Browse Source
This commit is contained in:
Quentin Legot 2021-02-10 11:21:33 +01:00
parent 7caf300cf5
commit 780b21bf0e
2 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/othello/Main.java
View File

@ -7,17 +7,9 @@ public class Main {
public static void main(String[] args) { public static void main(String[] args) {
for (int k=-1; k<2;k++) {
for (int l=-1; l<2; l++) {
if (k!=0 || l!=0) {
System.out.println(k+";"+l);
}
}
}
int p1 = 1, p2 = 2; int p1 = 1, p2 = 2;
int[][] board = initialize(p1, p2); int[][] board = initialize(p1, p2);
State game = new State(board, p1, p2,0,0); State game = new State(board, p1, p2);
//while(!game.isOver()) { //while(!game.isOver()) {
int player = game.getCurrentPlayer(); int player = game.getCurrentPlayer();

46
src/othello/State.java
View File

@ -12,16 +12,21 @@ public class State {
private int n1; private int n1;
private int n2; private int n2;
public State(int[][] board, int p1, int p2, int n1,int n2) { public State(int[][] board, int p1, int p2, int n1, int n2) {
this.board = board; this.board = board;
this.player1 = p1; this.player1 = p1;
this.player2 = p2; this.player2 = p2;
currentPlayer = p1; currentPlayer = p1;
this.n1 = n1+2; this.n1 = n1;
this.n2 = n2+2; this.n2 = n2;
}
public State(int[][] board, int p1, int p2) {
this(board, p1, p2, 2, 2);
} }
public boolean isOver() { public boolean isOver() {
return false; return false;
} }
@ -36,7 +41,7 @@ public class State {
// Recherche autour du pion du joueur courant // Recherche autour du pion du joueur courant
for (int k=-1; k<2;k++) { for (int k=-1; k<2;k++) {
for (int l=-1; l<2; l++) { for (int l=-1; l<2; l++) {
// La position du pion trouvé est exclue // La position du pion trouvé est exclue
if (k!=0 || l!=0) { if (k!=0 || l!=0) {
// Si une place libre est trouvée elle est ajoutée à la liste de coups // Si une place libre est trouvée elle est ajoutée à la liste de coups
if ( ((i+k >= 0) && (i+k < 7 )) && ((j+l >= 0) && (j+l < 7 )) && (this.board[i+k][j+l]==0)) { if ( ((i+k >= 0) && (i+k < 7 )) && ((j+l >= 0) && (j+l < 7 )) && (this.board[i+k][j+l]==0)) {
@ -63,26 +68,24 @@ public class State {
} }
public State play(int x, int y) { public State play(int x, int y) {
State copie = this.copie(); State copy = this.copy();
copie.board[x][y] = copie.getCurrentPlayer(); copy.board[x][y] = copy.getCurrentPlayer();
int increment = 0; int increment = 0;
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 {
copie.board[x+i][y+z] = copie.getCurrentPlayer(); copy.board[x+i][y+z] = copy.getCurrentPlayer();
increment+=1; increment+=1;
} catch (Exception e) { } catch (IndexOutOfBoundsException ignored) {}
}
} }
} }
if (currentPlayer == 1){ if (currentPlayer == 1){
copie.n1 += increment; copy.n1 += increment;
}else{ }else{
copie.n2 += increment; copy.n2 += increment;
} }
copie.switchPlayer(); copy.switchPlayer();
return copie; return copy;
} }
public int getCurrentPlayer() { public int getCurrentPlayer() {
return currentPlayer; return currentPlayer;
@ -92,23 +95,18 @@ public class State {
this.currentPlayer = currentPlayer; this.currentPlayer = currentPlayer;
} }
public State copie () { public State copy () {
State copie = new State (this.board, this.player1, this.player2,this.n1,this.n2); State copy = new State(this.board, this.player1, this.player2,this.n1,this.n2);
for (int i=0; i<this.board.length;i++) { for (int i=0; i<this.board.length;i++) {
for (int j=0; j<this.board.length; j++) { for (int j=0; j<this.board.length; j++) {
copie.board[i][j] = this.board[i][j]; copy.board[i][j] = this.board[i][j];
} }
} }
return copie; return copy;
} }
public void switchPlayer () { public void switchPlayer () {
if (getCurrentPlayer()==this.player1) { setCurrentPlayer(getCurrentPlayer() == this.player1 ? player2 : player1);
setCurrentPlayer(player2);
}
else {
setCurrentPlayer(player1);
}
} }
} }