14 Commits

Author SHA1 Message Date
16ea1700d8 refactor: alphabeta time printing 2025-05-02 19:56:00 +02:00
64bed4ea3a refactor: add signals to alphabetaai 2025-05-02 19:47:03 +02:00
2a3ea10389 fix warnings 2025-04-30 20:43:44 +02:00
3b225d9e23 feat: add audio 2025-04-30 20:41:10 +02:00
3b38e0da1f Super IA (#5)
Reviewed-on: #5
Co-authored-by: Persson-dev <sim16.prib@gmail.com>
Co-committed-by: Persson-dev <sim16.prib@gmail.com>
2025-04-30 18:28:01 +00:00
ecb0fdc623 Begin Audio (#7)
Reviewed-on: #7
Co-authored-by: Persson-dev <sim16.prib@gmail.com>
Co-committed-by: Persson-dev <sim16.prib@gmail.com>
2025-04-30 18:27:30 +00:00
4cbad80aaf begin 3d 2025-04-22 15:02:24 +02:00
2b5c2ad663 fix gradle input 2025-04-22 14:44:57 +02:00
Janet-Doe
0e2b07741d addo en passant test 2025-04-22 14:42:13 +02:00
b83726925e fix console 2025-04-18 10:33:10 +02:00
30eb12145d add hungry ai 2025-04-17 08:53:21 +02:00
17ef882d44 remove board from constructor 2025-04-16 19:29:31 +02:00
bee5e613bb refactor dumb ai castling 2025-04-16 19:25:04 +02:00
923ace22f1 add general ai 2025-04-16 19:21:47 +02:00
60 changed files with 1348 additions and 432 deletions

3
.gitattributes vendored
View File

@@ -3,7 +3,6 @@
# #
# Linux start script should use lf # Linux start script should use lf
/gradlew text eol=lf /gradlew text eol=lf
# These are Windows script files and should use crlf # These are Windows script files and should use crlf
*.bat text eol=crlf *.bat text eol=crlf
*.glb filter=lfs diff=lfs merge=lfs -text

2
.gitignore vendored
View File

@@ -7,3 +7,5 @@ build
app/bin app/bin
.vscode .vscode
audio/*.wav

View File

@@ -39,12 +39,20 @@ application {
applicationName = "3DChess" applicationName = "3DChess"
} }
run {
standardInput = System.in
}
jar { jar {
manifest { manifest {
attributes 'Main-Class': application.mainClass attributes 'Main-Class': application.mainClass
} }
} }
run {
standardInput = System.in
}
tasks.named('test') { tasks.named('test') {
// Use JUnit Platform for unit tests. // Use JUnit Platform for unit tests.
useJUnitPlatform() useJUnitPlatform()

View File

@@ -1,23 +1,30 @@
package chess; package chess;
import chess.view.consolerender.Colors;
import java.util.Scanner; import java.util.Scanner;
import chess.view.consolerender.Colors;
public class App { public class App {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(Colors.RED + "Credits: Grenier Lilas, Pribylski Simon." + Colors.RESET); System.out.println(Colors.RED + "Credits: Grenier Lilas, Pribylski Simon." + Colors.RESET);
System.out.println(""" System.out.println("""
Pick the version to use: Pick the version to use:
1 - Console 1 - Console
2 - Window."""); 2 - Window
switch (new Scanner(System.in).nextLine()) { 3 - 3D.""");
Scanner scan = new Scanner(System.in);
String line = scan.nextLine();
scan.close();
switch (line) {
case "1", "Console", "console": case "1", "Console", "console":
ConsoleMain.main(args); ConsoleMain.main(args);
break; break;
case "2", "Window", "window": case "2", "Window", "window":
SwingMain.main(args); SwingMain.main(args);
break; break;
case "3", "3D", "3d":
OpenGLMain.main(args);
break;
default: default:
System.out.println("Invalid input"); System.out.println("Invalid input");
break; break;

View File

@@ -5,26 +5,17 @@ package chess;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
import chess.model.ChessBoard;
import chess.model.Game; import chess.model.Game;
import chess.simulator.PromoteTest;
import chess.view.consolerender.Console; import chess.view.consolerender.Console;
public class ConsoleMain { public class ConsoleMain {
public static void main(String[] args) { public static void main(String[] args) {
Game game = new Game(new ChessBoard()); Game game = new Game();
CommandExecutor commandExecutor = new CommandExecutor(game); CommandExecutor commandExecutor = new CommandExecutor(game);
PromoteTest promoteTest = new PromoteTest(commandExecutor);
commandExecutor.addListener(promoteTest);
Console console = new Console(commandExecutor); Console console = new Console(commandExecutor);
commandExecutor.addListener(console); commandExecutor.addListener(console);
promoteTest.onComplete.connect(() -> {
console.setCaptureInput(true);
});
commandExecutor.executeCommand(new NewGameCommand()); commandExecutor.executeCommand(new NewGameCommand());
} }
} }

View File

@@ -1,33 +1,9 @@
package chess; package chess;
import chess.ai.DumbAI; import chess.view.DDDrender.Window;
import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand;
import chess.controller.event.GameAdaptator;
import chess.model.ChessBoard;
import chess.model.Color;
import chess.model.Game;
import chess.pgn.PgnExport;
import chess.view.render.Window;
public class OpenGLMain { public class OpenGLMain {
public static void main(String[] args) { public static void main(String[] args) {
Game game = new Game(new ChessBoard()); new Window().run();
CommandExecutor commandExecutor = new CommandExecutor(game);
Window window = new Window(commandExecutor);
commandExecutor.addListener(window);
// DumbAI ai = new DumbAI(commandExecutor, Color.Black);
// commandExecutor.addListener(ai);
// DumbAI ai2 = new DumbAI(commandExecutor, Color.White);
// commandExecutor.addListener(ai2);
commandExecutor.executeCommand(new NewGameCommand());
window.run();
} }
} }

View File

@@ -1,28 +1,35 @@
package chess; package chess;
import chess.ai.DumbAI; import chess.ai.minimax.AlphaBetaAI;
import chess.ai.minimax.AlphaBetaConsolePrinter;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
import chess.controller.event.GameAdaptator; import chess.controller.event.GameAdaptator;
import chess.model.ChessBoard;
import chess.model.Color; import chess.model.Color;
import chess.model.Game; import chess.model.Game;
import chess.pgn.PgnExport; import chess.pgn.PgnExport;
import chess.view.audio.GameAudio;
import chess.view.simplerender.Window; import chess.view.simplerender.Window;
public class SwingMain { public class SwingMain {
public static void main(String[] args) { public static void main(String[] args) {
Game game = new Game(new ChessBoard()); Game game = new Game();
CommandExecutor commandExecutor = new CommandExecutor(game); CommandExecutor commandExecutor = new CommandExecutor(game);
Window window = new Window(commandExecutor, false); Window window = new Window(commandExecutor, true);
commandExecutor.addListener(window); commandExecutor.addListener(window);
DumbAI ai = new DumbAI(commandExecutor, Color.Black); AlphaBetaAI ai = new AlphaBetaAI(commandExecutor, Color.Black, 5);
commandExecutor.addListener(ai); commandExecutor.addListener(ai);
DumbAI ai2 = new DumbAI(commandExecutor, Color.White); AlphaBetaConsolePrinter aiResults = new AlphaBetaConsolePrinter(ai);
commandExecutor.addListener(ai2); aiResults.connect();
// AI ai2 = new AlphaBetaAI(commandExecutor, Color.White, 5);
// commandExecutor.addListener(ai2);
// Window window2 = new Window(ai2.getSimulation(), false);
// ai2.getSimulation().addListener(window2);
commandExecutor.addListener(new GameAdaptator(){ commandExecutor.addListener(new GameAdaptator(){
@Override @Override
@@ -31,6 +38,8 @@ public class SwingMain {
} }
}); });
commandExecutor.addListener(new GameAudio());
commandExecutor.executeCommand(new NewGameCommand()); commandExecutor.executeCommand(new NewGameCommand());
} }
} }

View File

@@ -0,0 +1,81 @@
package chess.ai;
import java.util.List;
import chess.controller.Command;
import chess.controller.CommandExecutor;
import chess.controller.Command.CommandResult;
import chess.controller.commands.GetPieceAtCommand;
import chess.controller.commands.GetPlayerMovesCommand;
import chess.controller.commands.GetAllowedCastlingsCommand;
import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
import chess.controller.event.GameAdaptator;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
import chess.model.Piece;
public abstract class AI extends GameAdaptator{
protected final CommandExecutor commandExecutor;
protected final Color color;
public AI(CommandExecutor commandExecutor, Color color) {
this.commandExecutor = commandExecutor;
this.color = color;
}
protected abstract void play();
protected abstract void promote(Coordinate pawnCoords);
@Override
public void onPlayerTurn(Color color, boolean undone) {
if (this.color != color || undone)
return;
play();
}
@Override
public void onPromotePawn(Coordinate pieceCoords) {
Piece pawn = pieceAt(pieceCoords);
if (pawn.getColor() != this.color)
return;
promote(pieceCoords);
}
protected Piece pieceAt(Coordinate coordinate) {
GetPieceAtCommand command = new GetPieceAtCommand(coordinate);
sendCommand(command);
return command.getPiece();
}
protected List<Move> getAllowedMoves() {
return getAllowedMoves(this.commandExecutor);
}
protected List<Move> getAllowedMoves(CommandExecutor commandExecutor) {
GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
sendCommand(cmd, commandExecutor);
return cmd.getMoves();
}
protected CastlingResult getAllowedCastlings() {
GetAllowedCastlingsCommand cmd2 = new GetAllowedCastlingsCommand();
sendCommand(cmd2);
return cmd2.getCastlingResult();
}
protected CommandResult sendCommand(Command command) {
return sendCommand(command, this.commandExecutor);
}
protected CommandResult sendCommand(Command command, CommandExecutor commandExecutor) {
CommandResult result = commandExecutor.executeCommand(command);
if(result == CommandResult.NotAllowed){
System.out.println("eeeeee");
}
return result;
}
}

View File

@@ -3,46 +3,28 @@ package chess.ai;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import chess.controller.Command;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.CastlingCommand; import chess.controller.commands.CastlingCommand;
import chess.controller.commands.GetAllowedCastlingsCommand; import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
import chess.controller.commands.GetPieceAtCommand;
import chess.controller.commands.GetPlayerMovesCommand;
import chess.controller.commands.MoveCommand; import chess.controller.commands.MoveCommand;
import chess.controller.commands.PromoteCommand; import chess.controller.commands.PromoteCommand;
import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
import chess.controller.commands.PromoteCommand.PromoteType; import chess.controller.commands.PromoteCommand.PromoteType;
import chess.controller.event.GameAdaptator;
import chess.model.Color; import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
import chess.model.Piece;
public class DumbAI extends GameAdaptator { public class DumbAI extends AI {
private final Color player;
private final CommandExecutor commandExecutor;
private final Random random = new Random(); private final Random random = new Random();
public DumbAI(CommandExecutor commandExecutor, Color color) { public DumbAI(CommandExecutor commandExecutor, Color color) {
this.player = color; super(commandExecutor, color);
this.commandExecutor = commandExecutor;
} }
@Override @Override
public void onPlayerTurn(Color color) { protected void play() {
if (color != player) CastlingResult castlings = getAllowedCastlings();
return; List<Move> moves = getAllowedMoves();
GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
sendCommand(cmd);
GetAllowedCastlingsCommand cmd2 = new GetAllowedCastlingsCommand();
sendCommand(cmd2);
CastlingResult castlings = cmd2.getCastlingResult();
List<Move> moves = cmd.getMoves();
switch (castlings) { switch (castlings) {
case Both: { case Both: {
@@ -53,20 +35,12 @@ public class DumbAI extends GameAdaptator {
return; return;
} }
case Small: { case Small:
int randomMove = this.random.nextInt(moves.size() + 1);
if (randomMove != moves.size())
break;
this.commandExecutor.executeCommand(new CastlingCommand(false));
return;
}
case Big: { case Big: {
int randomMove = this.random.nextInt(moves.size() + 1); int randomMove = this.random.nextInt(moves.size() + 1);
if (randomMove != moves.size()) if (randomMove != moves.size())
break; break;
this.commandExecutor.executeCommand(new CastlingCommand(true)); this.commandExecutor.executeCommand(new CastlingCommand(castlings == CastlingResult.Big));
return; return;
} }
@@ -76,27 +50,12 @@ public class DumbAI extends GameAdaptator {
int randomMove = this.random.nextInt(moves.size()); int randomMove = this.random.nextInt(moves.size());
this.commandExecutor.executeCommand(new MoveCommand(moves.get(randomMove))); this.commandExecutor.executeCommand(new MoveCommand(moves.get(randomMove)));
} }
@Override @Override
public void onPromotePawn(Coordinate pieceCoords) { protected void promote(Coordinate pawnCoords) {
Piece pawn = pieceAt(pieceCoords);
if (pawn.getColor() != this.player)
return;
int promote = this.random.nextInt(PromoteType.values().length); int promote = this.random.nextInt(PromoteType.values().length);
this.commandExecutor.executeCommand(new PromoteCommand(PromoteType.values()[promote])); this.commandExecutor.executeCommand(new PromoteCommand(PromoteType.values()[promote]));
} }
private Piece pieceAt(Coordinate coordinate) {
GetPieceAtCommand command = new GetPieceAtCommand(coordinate);
sendCommand(command);
return command.getPiece();
}
private void sendCommand(Command command) {
this.commandExecutor.executeCommand(command);
}
} }

View File

@@ -0,0 +1,61 @@
package chess.ai;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import chess.controller.CommandExecutor;
import chess.controller.commands.MoveCommand;
import chess.controller.commands.PromoteCommand;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
import chess.model.Piece;
public class HungryAI extends AI {
private final PieceCost pieceCost;
private final Random random;
public HungryAI(CommandExecutor commandExecutor, Color color) {
super(commandExecutor, color);
this.pieceCost = new PieceCost(color);
this.random = new Random();
}
private int getMoveCost(Move move) {
Piece piece = pieceAt(move.getDeadPieceCoords());
return - (int) pieceCost.getCost(piece);
}
private List<Move> getBestMoves() {
List<Move> moves = getAllowedMoves();
List<Move> bestMoves = new ArrayList<>();
int bestCost = 0;
for (Move move : moves) {
int moveCost = getMoveCost(move);
if (moveCost == bestCost) {
bestMoves.add(move);
} else if (moveCost > bestCost) {
bestMoves.clear();
bestMoves.add(move);
bestCost = moveCost;
}
}
return bestMoves;
}
@Override
protected void play() {
List<Move> bestMoves = getBestMoves();
int randomMove = this.random.nextInt(bestMoves.size());
this.commandExecutor.executeCommand(new MoveCommand(bestMoves.get(randomMove)));
}
@Override
protected void promote(Coordinate pawnCoords) {
sendCommand(new PromoteCommand(PromoteType.Queen));
}
}

View File

@@ -0,0 +1,67 @@
package chess.ai;
import chess.model.Color;
import chess.model.Piece;
import chess.model.PieceVisitor;
import chess.model.pieces.Bishop;
import chess.model.pieces.King;
import chess.model.pieces.Knight;
import chess.model.pieces.Pawn;
import chess.model.pieces.Queen;
import chess.model.pieces.Rook;
public class PieceCost implements PieceVisitor<Float> {
private final Color player;
public static final float BISHOP = 30;
public static final float KING = 900;
public static final float KNIGHT = 30;
public static final float PAWN = 10;
public static final float QUEEN = 90;
public static final float ROOK = 50;
public PieceCost(Color color) {
this.player = color;
}
public float getCost(Piece piece) {
if (piece == null)
return 0;
float cost = visit(piece);
if (piece.getColor() != player)
cost = -cost;
return cost;
}
@Override
public Float visitPiece(Bishop bishop) {
return BISHOP;
}
@Override
public Float visitPiece(King king) {
return KING;
}
@Override
public Float visitPiece(Knight knight) {
return KNIGHT;
}
@Override
public Float visitPiece(Pawn pawn) {
return PAWN;
}
@Override
public Float visitPiece(Queen queen) {
return QUEEN;
}
@Override
public Float visitPiece(Rook rook) {
return ROOK;
}
}

View File

@@ -0,0 +1,129 @@
package chess.ai;
import java.util.Arrays;
import java.util.List;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Piece;
import chess.model.PieceVisitor;
import chess.model.pieces.Bishop;
import chess.model.pieces.King;
import chess.model.pieces.Knight;
import chess.model.pieces.Pawn;
import chess.model.pieces.Queen;
import chess.model.pieces.Rook;
public class PiecePosCost implements PieceVisitor<List<Float>> {
private final Color color;
private static final List<Float> BISHOP = Arrays.asList(
-2.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -2.0f,
-1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f,
-1.0f, 0.0f, 0.5f, 1.0f, 1.0f, 0.5f, 0.0f, -1.0f,
-1.0f, 0.5f, 0.5f, 1.0f, 1.0f, 0.5f, 0.5f, -1.0f,
-1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, -1.0f,
-1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, -1.0f,
-1.0f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, -1.0f,
-2.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -2.0f);
private static final List<Float> KING = Arrays.asList(
-3.0f, -4.0f, -4.0f, -5.0f, -5.0f, -4.0f, -4.0f, -3.0f,
-3.0f, -4.0f, -4.0f, -5.0f, -5.0f, -4.0f, -4.0f, -3.0f,
-3.0f, -4.0f, -4.0f, -5.0f, -5.0f, -4.0f, -4.0f, -3.0f,
-3.0f, -4.0f, -4.0f, -5.0f, -5.0f, -4.0f, -4.0f, -3.0f,
-2.0f, -3.0f, -3.0f, -4.0f, -4.0f, -3.0f, -3.0f, -2.0f,
-1.0f, -2.0f, -2.0f, -2.0f, -2.0f, -2.0f, -2.0f, -1.0f,
2.0f, 2.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 2.0f,
2.0f, 3.0f, 1.0f, 0.0f, 0.0f, 1.0f, 3.0f, 2.0f);
private static final List<Float> KNIGHT = Arrays.asList(
-5.0f, -4.0f, -3.0f, -3.0f, -3.0f, -3.0f, -4.0f, -5.0f,
-4.0f, -2.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -4.0f,
-3.0f, 0.0f, 1.0f, 1.5f, 1.5f, 1.0f, 0.0f, -3.0f,
-3.0f, 0.5f, 1.5f, 2.0f, 2.0f, 1.5f, 0.5f, -3.0f,
-3.0f, 0.0f, 1.5f, 2.0f, 2.0f, 1.5f, 0.0f, -3.0f,
-3.0f, 0.5f, 1.0f, 1.5f, 1.5f, 1.0f, 0.5f, -3.0f,
-4.0f, -2.0f, 0.0f, 0.5f, 0.5f, 0.0f, -2.0f, -4.0f,
-5.0f, -4.0f, -3.0f, -3.0f, -3.0f, -3.0f, -4.0f, -5.0f);
private static final List<Float> PAWN = Arrays.asList(
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f,
1.0f, 1.0f, 2.0f, 3.0f, 3.0f, 2.0f, 1.0f, 1.0f,
0.5f, 0.5f, 1.0f, 2.5f, 2.5f, 1.0f, 0.5f, 0.5f,
0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 1.0f, 0.0f, 0.0f,
0.5f, -0.5f, -1.0f, 0.0f, 0.0f, -1.0f, -0.5f, 0.5f,
0.5f, 1.0f, 1.0f, -2.0f, -2.0f, 1.0f, 1.0f, 0.5f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
private static final List<Float> QUEEN = Arrays.asList(
-2.0f, -1.0f, -1.0f, -0.5f, -0.5f, -1.0f, -1.0f, -2.0f,
-1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f,
-1.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.5f, 0.0f, -1.0f,
-0.5f, 0.0f, 0.5f, 0.5f, 0.5f, 0.5f, 0.0f, -0.5f,
0.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.5f, 0.0f, -0.5f,
-1.0f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.0f, -1.0f,
-1.0f, 0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f,
-2.0f, -1.0f, -1.0f, -0.5f, -0.5f, -1.0f, -1.0f, -2.0f);
private static final List<Float> ROOK = Arrays.asList(
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.5f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f,
-0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.5f,
-0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.5f,
-0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.5f,
-0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.5f,
-0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.5f,
0.0f, 0.0f, 0.0f, 0.5f, 0.5f, 0.0f, 0.0f, 0.0f);
public PiecePosCost(Color color) {
this.color = color;
}
public float getEvaluation(Piece piece, Coordinate coordinate) {
if (piece == null)
return 0;
List<Float> positions = visit(piece);
int x = piece.getColor() == Color.Black ? (Coordinate.VALUE_MAX - 1 - coordinate.getX()) : coordinate.getX();
int y = piece.getColor() == Color.Black ? (Coordinate.VALUE_MAX - 1 - coordinate.getY()) : coordinate.getY();
Coordinate newCoords = new Coordinate(x, y);
assert newCoords.isValid();
float result = positions.get(newCoords.toIndex());
if (piece.getColor() != color)
return -result;
return result;
}
@Override
public List<Float> visitPiece(Bishop bishop) {
return BISHOP;
}
@Override
public List<Float> visitPiece(King king) {
return KING;
}
@Override
public List<Float> visitPiece(Knight knight) {
return KNIGHT;
}
@Override
public List<Float> visitPiece(Pawn pawn) {
return PAWN;
}
@Override
public List<Float> visitPiece(Queen queen) {
return QUEEN;
}
@Override
public List<Float> visitPiece(Rook rook) {
return ROOK;
}
}

View File

@@ -0,0 +1,92 @@
package chess.ai.minimax;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import chess.ai.AI;
import chess.controller.CommandExecutor;
import chess.controller.commands.MoveCommand;
import chess.controller.commands.PromoteCommand;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
import common.Signal1;
public class AlphaBetaAI extends AI {
private final int searchDepth;
private static final float MAX_FLOAT = Float.MAX_VALUE;
private static final float MIN_FLOAT = -MAX_FLOAT;
private final ExecutorService threadPool;
public final Signal1<Integer> onStartEval = new Signal1<>();
public final Signal1<Float> onCompleteEval = new Signal1<>();
public final Signal1<Float> onProgress = new Signal1<>();
public AlphaBetaAI(CommandExecutor commandExecutor, Color color, int searchDepth) {
super(commandExecutor, color);
this.searchDepth = searchDepth;
int threadCount = Runtime.getRuntime().availableProcessors();
this.threadPool = Executors.newFixedThreadPool(threadCount,
new AlphaBetaThreadCreator(commandExecutor, color, threadCount));
}
private Move getBestMove() {
List<Move> moves = getAllowedMoves();
List<Future<Float>> moveEvaluations = new ArrayList<>(50);
float bestMoveValue = MIN_FLOAT;
Move bestMove = null;
this.onStartEval.emit(moves.size());
for (Move move : moves) {
moveEvaluations.add(this.threadPool.submit(() -> {
return AlphaBetaThreadCreator.getMoveValue(move, this.searchDepth);
}));
}
for (int i = 0; i < moves.size(); i++) {
this.onProgress.emit((float) i / (float) moves.size());
Move move = moves.get(i);
float value = MIN_FLOAT;
try {
value = moveEvaluations.get(i).get();
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
if (value > bestMoveValue) {
bestMoveValue = value;
bestMove = move;
}
}
this.onCompleteEval.emit(bestMoveValue);
return bestMove;
}
@Override
public void onGameEnd() {
this.threadPool.close();
}
@Override
protected void play() {
Move move = getBestMove();
sendCommand(new MoveCommand(move));
}
@Override
protected void promote(Coordinate pawnCoords) {
sendCommand(new PromoteCommand(PromoteType.Queen));
}
}

View File

@@ -0,0 +1,27 @@
package chess.ai.minimax;
public class AlphaBetaConsolePrinter {
private final AlphaBetaAI ai;
private long lastTime;
public void connect() {
ai.onStartEval.connect((moveCount) -> {
this.lastTime = System.currentTimeMillis();
System.out.println("Evaluating " + moveCount + " moves ...");
});
ai.onProgress.connect((progress) -> {
System.out.printf("Progress : %.2f %% \r", progress * 100.0f);
});
ai.onCompleteEval.connect((bestMove) -> {
System.out.println("Best move : " + bestMove + " ");
System.out.println("Took " + (System.currentTimeMillis() - this.lastTime) + "ms");
});
}
public AlphaBetaConsolePrinter(AlphaBetaAI ai) {
this.ai = ai;
}
}

View File

@@ -0,0 +1,101 @@
package chess.ai.minimax;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import chess.ai.PieceCost;
import chess.ai.PiecePosCost;
import chess.model.ChessBoard;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
import chess.model.Piece;
public class AlphaBetaThread extends Thread {
private final GameSimulation simulation;
private final PieceCost pieceCost;
private final PiecePosCost piecePosCost;
private static final int GREAT_MOVE = 9999;
private static final float MAX_FLOAT = Float.MAX_VALUE;
private static final float MIN_FLOAT = -MAX_FLOAT;
public AlphaBetaThread(Runnable task, GameSimulation simulation, Color color) {
super(task);
this.simulation = simulation;
this.pieceCost = new PieceCost(color);
this.piecePosCost = new PiecePosCost(color);
}
private float getEndGameEvaluation() {
Color currentTurn = this.simulation.getPlayerTurn();
if (this.simulation.getBoard().isKingInCheck(currentTurn))
return GREAT_MOVE;
return getBoardEvaluation() - PieceCost.PAWN;
}
private float getBoardEvaluation() {
final ChessBoard board = this.simulation.getBoard();
float result = 0;
for (int i = 0; i < Coordinate.VALUE_MAX; i++) {
for (int j = 0; j < Coordinate.VALUE_MAX; j++) {
Coordinate coordinate = new Coordinate(i, j);
Piece piece = board.pieceAt(coordinate);
result += pieceCost.getCost(piece) + piecePosCost.getEvaluation(piece, coordinate);
}
}
return result;
}
public float getMoveValue(Move move, int searchDepth) {
this.simulation.tryMove(move);
float value = -negaMax(searchDepth - 1, MIN_FLOAT, MAX_FLOAT);
this.simulation.undoMove();
return value;
}
private float negaMax(int depth, float alpha, float beta) {
float value = MIN_FLOAT;
List<Move> moves = this.simulation.getAllowedMoves();
if (moves.isEmpty())
return -getEndGameEvaluation();
List<Entry<Move, Float>> movesCost = new ArrayList<>(moves.size());
for (Move move : moves) {
this.simulation.tryMove(move);
movesCost.add(Map.entry(move, -getBoardEvaluation()));
this.simulation.undoMove();
}
Collections.sort(movesCost, (first, second) -> {
return Float.compare(first.getValue(), second.getValue());
});
if (depth == 1)
return -movesCost.getFirst().getValue();
for (var moveEntry : movesCost) {
Move move = moveEntry.getKey();
this.simulation.tryMove(move);
value = Float.max(value, -negaMax(depth - 1, -beta, -alpha));
this.simulation.undoMove();
alpha = Float.max(alpha, value);
if (alpha >= beta)
return value;
}
return value;
}
public GameSimulation getSimulation() {
return simulation;
}
}

View File

@@ -0,0 +1,36 @@
package chess.ai.minimax;
import java.util.concurrent.ThreadFactory;
import chess.controller.CommandExecutor;
import chess.model.Color;
import chess.model.Move;
public class AlphaBetaThreadCreator implements ThreadFactory{
private final Color color;
private final GameSimulation simulations[];
private int currentThread = 0;
public AlphaBetaThreadCreator(CommandExecutor commandExecutor, Color color, int threadCount) {
this.color = color;
simulations = new GameSimulation[threadCount];
for (int i = 0; i < threadCount; i++) {
simulations[i] = new GameSimulation();
commandExecutor.addListener(simulations[i]);
}
}
public static float getMoveValue(Move move, int searchDepth) {
AlphaBetaThread t = (AlphaBetaThread) Thread.currentThread();
return t.getMoveValue(move, searchDepth);
}
@Override
public Thread newThread(Runnable r) {
AlphaBetaThread t = new AlphaBetaThread(r, simulations[currentThread], color);
currentThread++;
return t;
}
}

View File

@@ -0,0 +1,103 @@
package chess.ai.minimax;
import java.util.List;
import chess.controller.Command;
import chess.controller.Command.CommandResult;
import chess.controller.CommandExecutor;
import chess.controller.commands.CastlingCommand;
import chess.controller.commands.GetPlayerMovesCommand;
import chess.controller.commands.MoveCommand;
import chess.controller.commands.NewGameCommand;
import chess.controller.commands.PromoteCommand;
import chess.controller.commands.UndoCommand;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.controller.event.EmptyGameDispatcher;
import chess.controller.event.GameAdaptator;
import chess.model.ChessBoard;
import chess.model.Color;
import chess.model.Game;
import chess.model.Move;
import chess.model.PermissiveGame;
public class GameSimulation extends GameAdaptator {
private final CommandExecutor simulation;
private final Game gameSimulation;
public GameSimulation() {
this.gameSimulation = new PermissiveGame();
this.simulation = new CommandExecutor(gameSimulation, new EmptyGameDispatcher());
}
protected CommandResult sendCommand(Command command) {
CommandResult result = this.simulation.executeCommand(command);
if (result == CommandResult.NotAllowed) {
System.out.println("eeeeee");
}
return result;
}
public void tryMove(Move move) {
sendCommand(new MoveCommand(move));
if (this.gameSimulation.getBoard().pawnShouldBePromoted())
sendCommand(new PromoteCommand(PromoteType.Queen));
}
public void undoMove() {
sendCommand(new UndoCommand());
}
@Override
public void onPawnPromoted(PromoteType promotion) {
sendCommand(new PromoteCommand(promotion));
}
@Override
public void onCastling(boolean bigCastling) {
sendCommand(new CastlingCommand(bigCastling));
}
@Override
public void onMove(Move move, boolean captured) {
sendCommand(new MoveCommand(move));
}
@Override
public void onGameStart() {
sendCommand(new NewGameCommand());
}
@Override
public void onPlayerTurn(Color color, boolean undone) {
if (undone)
sendCommand(new UndoCommand());
}
public CommandExecutor getCommandExecutor() {
return simulation;
}
public Game getGame() {
return gameSimulation;
}
public ChessBoard getBoard() {
return this.gameSimulation.getBoard();
}
public Color getPlayerTurn() {
return this.gameSimulation.getPlayerTurn();
}
public List<Move> getAllowedMoves() {
GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
sendCommand(cmd);
return cmd.getMoves();
}
public void close() {
this.simulation.close();
}
}

View File

@@ -2,6 +2,7 @@ package chess.controller;
import chess.controller.Command.CommandResult; import chess.controller.Command.CommandResult;
import chess.controller.commands.UndoCommand; import chess.controller.commands.UndoCommand;
import chess.controller.event.AsyncGameDispatcher;
import chess.controller.event.GameDispatcher; import chess.controller.event.GameDispatcher;
import chess.controller.event.GameListener; import chess.controller.event.GameListener;
import chess.model.Game; import chess.model.Game;
@@ -17,7 +18,7 @@ public class CommandExecutor {
} }
public CommandExecutor(Game game) { public CommandExecutor(Game game) {
this(game, new GameDispatcher()); this(game, new AsyncGameDispatcher());
} }
public CommandExecutor(Game game, GameDispatcher dispatcher) { public CommandExecutor(Game game, GameDispatcher dispatcher) {
@@ -52,19 +53,21 @@ public class CommandExecutor {
return; return;
case Moved: case Moved:
boolean notifyPlayerTurn = true;
this.dispatcher.onBoardUpdate(); this.dispatcher.onBoardUpdate();
if (checkGameStatus()) { if (!(command instanceof UndoCommand) && checkGameStatus()) {
this.dispatcher.onGameEnd(); this.dispatcher.onGameEnd();
return; notifyPlayerTurn = false;
} }
switchPlayerTurn(); switchPlayerTurn(command instanceof UndoCommand, notifyPlayerTurn);
return; return;
} }
} }
private void switchPlayerTurn() { private void switchPlayerTurn(boolean undone, boolean notifyPlayerTurn) {
this.game.switchPlayerTurn(); this.game.switchPlayerTurn();
this.dispatcher.onPlayerTurn(this.game.getPlayerTurn()); if (notifyPlayerTurn)
this.dispatcher.onPlayerTurn(this.game.getPlayerTurn(), undone);
} }
/** /**
@@ -107,6 +110,6 @@ public class CommandExecutor {
} }
public void close() { public void close() {
this.dispatcher.stopService(); this.dispatcher.close();
} }
} }

View File

@@ -49,6 +49,10 @@ public class CastlingCommand extends PlayerCommand {
board.applyMove(this.kingMove); board.applyMove(this.kingMove);
board.applyMove(this.rookMove); board.applyMove(this.rookMove);
board.setLastMove(this.kingMove);
outputSystem.onCastling(this.bigCastling);
return CommandResult.Moved; return CommandResult.Moved;
} }

View File

@@ -37,7 +37,6 @@ public class MoveCommand extends PlayerCommand {
return result; return result;
case Moved: case Moved:
outputSystem.onMove(this.move);
game.saveTraitPiecesPos(); game.saveTraitPiecesPos();
return result; return result;
@@ -53,7 +52,7 @@ public class MoveCommand extends PlayerCommand {
final ChessBoard board = game.getBoard(); final ChessBoard board = game.getBoard();
// we must promote the pending pawn before // we must promote the pending pawn before
if (board.pawnShouldBePromoted()) if (game.pawnShouldBePromoted())
return CommandResult.NotAllowed; return CommandResult.NotAllowed;
Piece piece = board.pieceAt(move.getStart()); Piece piece = board.pieceAt(move.getStart());
@@ -76,11 +75,14 @@ public class MoveCommand extends PlayerCommand {
} }
if (tryPromote(game, outputSystem)) { if (tryPromote(game, outputSystem)) {
outputSystem.onMove(this.move, this.deadPiece != null);
return CommandResult.ActionNeeded; return CommandResult.ActionNeeded;
} }
board.setLastMove(this.move); board.setLastMove(this.move);
outputSystem.onMove(this.move, this.deadPiece != null);
return CommandResult.Moved; return CommandResult.Moved;
} }

View File

@@ -51,7 +51,7 @@ public class NewGameCommand extends Command {
game.reset(); game.reset();
outputSystem.onGameStart(); outputSystem.onGameStart();
outputSystem.onPlayerTurn(game.getPlayerTurn()); outputSystem.onPlayerTurn(game.getPlayerTurn(), false);
return CommandResult.NotMoved; return CommandResult.NotMoved;
} }

View File

@@ -55,6 +55,8 @@ public class PromoteCommand extends PlayerCommand {
this.oldPawn = pawn; this.oldPawn = pawn;
board.pieceComes(createPiece(this.promoteType, pawn.getColor()), this.pieceCoords); board.pieceComes(createPiece(this.promoteType, pawn.getColor()), this.pieceCoords);
outputSystem.onPawnPromoted(this.promoteType);
return CommandResult.Moved; return CommandResult.Moved;
} }

View File

@@ -0,0 +1,113 @@
package chess.controller.event;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.Consumer;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
public class AsyncGameDispatcher extends GameDispatcher {
private final List<GameListener> listeners;
private final ExecutorService executor;
public AsyncGameDispatcher() {
this.listeners = new ArrayList<>();
this.executor = Executors.newSingleThreadExecutor();
}
@Override
public void addListener(GameListener listener) {
this.listeners.add(listener);
}
private void asyncForEachCall(Consumer<GameListener> func) {
this.executor.execute(() -> this.listeners.forEach(func));
}
@Override
public void onPlayerTurn(Color color, boolean undone) {
asyncForEachCall((l) -> l.onPlayerTurn(color, undone));
}
@Override
public void onWin(Color color) {
asyncForEachCall((l) -> l.onWin(color));
}
@Override
public void onKingInCheck() {
asyncForEachCall((l) -> l.onKingInCheck());
}
@Override
public void onKingInMat() {
asyncForEachCall((l) -> l.onKingInMat());
}
@Override
public void onPatSituation() {
asyncForEachCall((l) -> l.onPatSituation());
}
@Override
public void onSurrender(Color color) {
asyncForEachCall((l) -> l.onSurrender(color));
}
@Override
public void onGameStart() {
asyncForEachCall((l) -> l.onGameStart());
}
@Override
public void onPromotePawn(Coordinate pieceCoords) {
asyncForEachCall((l) -> l.onPromotePawn(pieceCoords));
}
@Override
public void onBoardUpdate() {
asyncForEachCall((l) -> l.onBoardUpdate());
}
@Override
public void onGameEnd() {
asyncForEachCall((l) -> l.onGameEnd());
}
@Override
public void onMove(Move move, boolean captured) {
asyncForEachCall((l) -> l.onMove(move, captured));
}
@Override
public void onMoveNotAllowed(Move move) {
asyncForEachCall((l) -> l.onMoveNotAllowed(move));
}
@Override
public void onDraw() {
asyncForEachCall((l) -> l.onDraw());
}
@Override
public void onCastling(boolean bigCastling) {
asyncForEachCall((l) -> l.onCastling(bigCastling));
}
@Override
public void onPawnPromoted(PromoteType promotion) {
asyncForEachCall((l) -> l.onPawnPromoted(promotion));
}
@Override
public void close() {
this.executor.shutdown();
}
}

View File

@@ -1,5 +1,6 @@
package chess.controller.event; package chess.controller.event;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.model.Color; import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
@@ -31,7 +32,7 @@ public class EmptyGameDispatcher extends GameDispatcher {
} }
@Override @Override
public void onMove(Move move) { public void onMove(Move move, boolean captured) {
} }
@Override @Override
@@ -43,7 +44,7 @@ public class EmptyGameDispatcher extends GameDispatcher {
} }
@Override @Override
public void onPlayerTurn(Color color) { public void onPlayerTurn(Color color, boolean undone) {
} }
@Override @Override
@@ -58,4 +59,20 @@ public class EmptyGameDispatcher extends GameDispatcher {
public void onWin(Color winner) { public void onWin(Color winner) {
} }
@Override
public void onCastling(boolean bigCastling) {
}
@Override
public void onPawnPromoted(PromoteType promotion) {
}
@Override
public void addListener(GameListener listener) {
}
@Override
public void close() {
}
} }

View File

@@ -1,5 +1,6 @@
package chess.controller.event; package chess.controller.event;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.model.Color; import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
@@ -7,7 +8,7 @@ import chess.model.Move;
public abstract class GameAdaptator implements GameListener { public abstract class GameAdaptator implements GameListener {
@Override @Override
public void onPlayerTurn(Color color) {} public void onPlayerTurn(Color color, boolean undone) {}
@Override @Override
public void onWin(Color color) {} public void onWin(Color color) {}
@@ -37,7 +38,7 @@ public abstract class GameAdaptator implements GameListener {
public void onGameEnd() {} public void onGameEnd() {}
@Override @Override
public void onMove(Move move) {} public void onMove(Move move, boolean captured) {}
@Override @Override
public void onMoveNotAllowed(Move move) {} public void onMoveNotAllowed(Move move) {}
@@ -45,4 +46,10 @@ public abstract class GameAdaptator implements GameListener {
@Override @Override
public void onDraw() {} public void onDraw() {}
@Override
public void onCastling(boolean bigCastling) {}
@Override
public void onPawnPromoted(PromoteType promotion) {}
} }

View File

@@ -1,100 +1,9 @@
package chess.controller.event; package chess.controller.event;
import java.util.ArrayList; public abstract class GameDispatcher extends GameAdaptator {
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.Consumer;
import chess.model.Color; public abstract void addListener(GameListener listener);
import chess.model.Coordinate;
import chess.model.Move;
public class GameDispatcher implements GameListener { public abstract void close();
private final List<GameListener> listeners;
private final ExecutorService executor;
public GameDispatcher() {
this.listeners = new ArrayList<>();
this.executor = Executors.newSingleThreadExecutor();
}
public void addListener(GameListener listener) {
this.listeners.add(listener);
}
private void asyncForEachCall(Consumer<GameListener> func) {
this.executor.execute(() -> this.listeners.forEach(func));
}
@Override
public void onPlayerTurn(Color color) {
asyncForEachCall((l) -> l.onPlayerTurn(color));
}
@Override
public void onWin(Color color) {
asyncForEachCall((l) -> l.onWin(color));
}
@Override
public void onKingInCheck() {
asyncForEachCall((l) -> l.onKingInCheck());
}
@Override
public void onKingInMat() {
asyncForEachCall((l) -> l.onKingInMat());
}
@Override
public void onPatSituation() {
asyncForEachCall((l) -> l.onPatSituation());
}
@Override
public void onSurrender(Color color) {
asyncForEachCall((l) -> l.onSurrender(color));
}
@Override
public void onGameStart() {
asyncForEachCall((l) -> l.onGameStart());
}
@Override
public void onPromotePawn(Coordinate pieceCoords) {
asyncForEachCall((l) -> l.onPromotePawn(pieceCoords));
}
@Override
public void onBoardUpdate() {
asyncForEachCall((l) -> l.onBoardUpdate());
}
@Override
public void onGameEnd() {
asyncForEachCall((l) -> l.onGameEnd());
}
@Override
public void onMove(Move move) {
asyncForEachCall((l) -> l.onMove(move));
}
@Override
public void onMoveNotAllowed(Move move) {
asyncForEachCall((l) -> l.onMoveNotAllowed(move));
}
@Override
public void onDraw() {
asyncForEachCall((l) -> l.onDraw());
}
public void stopService() {
this.executor.shutdown();
}
} }

View File

@@ -1,5 +1,6 @@
package chess.controller.event; package chess.controller.event;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.model.Color; import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
@@ -38,12 +39,15 @@ public interface GameListener {
/** /**
* Invoked when a valid move on the board occurs * Invoked when a valid move on the board occurs
*
* @param move the move to be processed * @param move the move to be processed
* @param captured whether the move is a result of a capture
*/ */
void onMove(Move move); void onMove(Move move, boolean captured);
/** /**
* Invoked when a sent move is not allowed * Invoked when a sent move is not allowed
*
* @param move the move to be processed * @param move the move to be processed
*/ */
void onMoveNotAllowed(Move move); void onMoveNotAllowed(Move move);
@@ -55,26 +59,46 @@ public interface GameListener {
/** /**
* Invoked when it's the player turn * Invoked when it's the player turn
*
* @param color the color of the player who should play * @param color the color of the player who should play
* @param undone true if it's a result of an undo command
*/ */
void onPlayerTurn(Color color); void onPlayerTurn(Color color, boolean undone);
/** /**
* Invoked when a pawn should be promoted * Invoked when a pawn should be promoted
*
* @param pieceCoords the coordinates of the pawn * @param pieceCoords the coordinates of the pawn
*/ */
void onPromotePawn(Coordinate pieceCoords); void onPromotePawn(Coordinate pieceCoords);
/** /**
* Invoked when a players surrenders * Invoked when a players surrenders
*
* @param coward the player who gave up * @param coward the player who gave up
*/ */
void onSurrender(Color coward); void onSurrender(Color coward);
/** /**
* Invoked when a player wins (by checkmate or if the other one surrenders) * Invoked when a player wins (by checkmate or if the other one surrenders)
*
* @param winner * @param winner
*/ */
void onWin(Color winner); void onWin(Color winner);
/**
* Invoked when a castling is done
*
* @param bigCastling if it's queen side castling
*/
void onCastling(boolean bigCastling);
/**
* Invoked when a pawn is promoted
*
* @param promotion the type of promotion
* @param player the player who promoted the pawns
*/
void onPawnPromoted(PromoteType promotion);
} }

View File

@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import chess.model.visitor.KingIdentifier; import chess.model.pieces.King;
import chess.model.visitor.PawnIdentifier; import chess.model.visitor.PawnIdentifier;
import chess.model.visitor.PiecePathChecker; import chess.model.visitor.PiecePathChecker;
@@ -31,6 +31,10 @@ public class ChessBoard {
private Move lastMove; private Move lastMove;
private Piece lastEjectedPiece; private Piece lastEjectedPiece;
private List<Move> cachedAllowedMoves = null;
private final Coordinate kingPos[];
public ChessBoard() { public ChessBoard() {
this.cells = new Cell[Coordinate.VALUE_MAX][Coordinate.VALUE_MAX]; this.cells = new Cell[Coordinate.VALUE_MAX][Coordinate.VALUE_MAX];
for (int i = 0; i < Coordinate.VALUE_MAX; i++) { for (int i = 0; i < Coordinate.VALUE_MAX; i++) {
@@ -41,6 +45,7 @@ public class ChessBoard {
this.lastVirtualMove = null; this.lastVirtualMove = null;
this.lastMove = null; this.lastMove = null;
this.lastEjectedPiece = null; this.lastEjectedPiece = null;
this.kingPos = new Coordinate[Color.values().length];
} }
public void applyMove(Move move) { public void applyMove(Move move) {
@@ -98,6 +103,8 @@ public class ChessBoard {
public void pieceComes(Piece piece, Coordinate coordinate) { public void pieceComes(Piece piece, Coordinate coordinate) {
cellAt(coordinate).setPiece(piece); cellAt(coordinate).setPiece(piece);
if (piece instanceof King)
this.kingPos[piece.getColor().ordinal()] = coordinate;
} }
public void pieceLeaves(Coordinate coordinate) { public void pieceLeaves(Coordinate coordinate) {
@@ -105,18 +112,19 @@ public class ChessBoard {
} }
public Coordinate findKing(Color color) { public Coordinate findKing(Color color) {
KingIdentifier kingIdentifier = new KingIdentifier(color); // KingIdentifier kingIdentifier = new KingIdentifier(color);
for (int i = 0; i < Coordinate.VALUE_MAX; i++) { // for (int i = 0; i < Coordinate.VALUE_MAX; i++) {
for (int j = 0; j < Coordinate.VALUE_MAX; j++) { // for (int j = 0; j < Coordinate.VALUE_MAX; j++) {
Coordinate coordinate = new Coordinate(i, j); // Coordinate coordinate = new Coordinate(i, j);
Piece piece = pieceAt(coordinate); // Piece piece = pieceAt(coordinate);
if (kingIdentifier.isKing(piece)) { // if (kingIdentifier.isKing(piece)) {
return coordinate; // return coordinate;
} // }
} // }
} // }
assert false : "No king found ?!"; // assert false : "No king found ?!";
return null; // return null;
return kingPos[color.ordinal()];
} }
public boolean isKingInCheck(Color color) { public boolean isKingInCheck(Color color) {
@@ -127,7 +135,7 @@ public class ChessBoard {
for (int j = 0; j < Coordinate.VALUE_MAX; j++) { for (int j = 0; j < Coordinate.VALUE_MAX; j++) {
Coordinate attackCoords = new Coordinate(i, j); Coordinate attackCoords = new Coordinate(i, j);
Piece attackPiece = pieceAt(attackCoords); Piece attackPiece = pieceAt(attackCoords);
if (attackPiece == null) if (attackPiece == null || attackPiece.getColor() == color)
continue; continue;
PiecePathChecker checker = new PiecePathChecker(this, new Move(attackCoords, kingPos)); PiecePathChecker checker = new PiecePathChecker(this, new Move(attackCoords, kingPos));
@@ -143,6 +151,10 @@ public class ChessBoard {
} }
public List<Move> getAllowedMoves(Color player) { public List<Move> getAllowedMoves(Color player) {
if (this.cachedAllowedMoves != null) {
return this.cachedAllowedMoves;
}
List<Move> result = new ArrayList<>(); List<Move> result = new ArrayList<>();
for (int x = 0; x < Coordinate.VALUE_MAX; x++) { for (int x = 0; x < Coordinate.VALUE_MAX; x++) {
@@ -159,6 +171,11 @@ public class ChessBoard {
Coordinate destination = new Coordinate(i, j); Coordinate destination = new Coordinate(i, j);
Move move = new Move(start, destination); Move move = new Move(start, destination);
Piece destPiece = pieceAt(destination);
if (destPiece != null && destPiece.getColor() == player)
continue;
PiecePathChecker piecePathChecker = new PiecePathChecker(this, PiecePathChecker piecePathChecker = new PiecePathChecker(this,
move); move);
if (!piecePathChecker.isValid()) if (!piecePathChecker.isValid())
@@ -172,6 +189,7 @@ public class ChessBoard {
} }
} }
} }
this.cachedAllowedMoves = result;
return result; return result;
} }
@@ -300,10 +318,11 @@ public class ChessBoard {
public void setLastMove(Move lastMove) { public void setLastMove(Move lastMove) {
this.lastMove = lastMove; this.lastMove = lastMove;
this.cachedAllowedMoves = null;
} }
@Override @Override
public boolean equals(Object obj){ public boolean equals(Object obj) {
if (obj instanceof ChessBoard board) if (obj instanceof ChessBoard board)
return board.hashCode() == this.hashCode(); return board.hashCode() == this.hashCode();
return false; return false;

View File

@@ -20,8 +20,8 @@ public class Game {
Draw, Check, CheckMate, OnGoing, Pat; Draw, Check, CheckMate, OnGoing, Pat;
} }
public Game(ChessBoard board) { public Game() {
this.board = board; this.board = new ChessBoard();
this.movesHistory = new Stack<>(); this.movesHistory = new Stack<>();
this.traitsPos = new HashMap<>(); this.traitsPos = new HashMap<>();
} }
@@ -70,24 +70,27 @@ public class Game {
playerTurn = Color.getEnemy(playerTurn); playerTurn = Color.getEnemy(playerTurn);
} }
public GameStatus checkGameStatus() { // this is the bottleneck of algorithms using this chess engine
final Color enemy = Color.getEnemy(getPlayerTurn()); public GameStatus checkGameStatus(Color color) {
if (checkDraw()) if (checkDraw())
return GameStatus.Draw; return GameStatus.Draw;
if (this.board.isKingInCheck(enemy)) if (this.board.isKingInCheck(color))
if (this.board.hasAllowedMoves(enemy)) if (this.board.hasAllowedMoves(color))
return GameStatus.Check; return GameStatus.Check;
else else
return GameStatus.CheckMate; return GameStatus.CheckMate;
if (!board.hasAllowedMoves(enemy)) if (!board.hasAllowedMoves(color))
return GameStatus.Pat; return GameStatus.Pat;
return GameStatus.OnGoing; return GameStatus.OnGoing;
} }
public GameStatus checkGameStatus() {
return checkGameStatus(Color.getEnemy(getPlayerTurn()));
}
public void addAction(PlayerCommand command) { public void addAction(PlayerCommand command) {
this.movesHistory.add(command); this.movesHistory.add(command);
} }
@@ -119,4 +122,8 @@ public class Game {
return this.movesHistory; return this.movesHistory;
} }
public boolean pawnShouldBePromoted() {
return this.board.pawnShouldBePromoted();
}
} }

View File

@@ -0,0 +1,20 @@
package chess.model;
public class PermissiveGame extends Game {
@Override
public GameStatus checkGameStatus(Color color) {
return GameStatus.OnGoing;
}
@Override
public void undoTraitPiecesPos() {
}
@Override
public void saveTraitPiecesPos() {
}
}

View File

@@ -11,7 +11,6 @@ import chess.controller.commands.MoveCommand;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
import chess.controller.commands.PromoteCommand; import chess.controller.commands.PromoteCommand;
import chess.controller.event.EmptyGameDispatcher; import chess.controller.event.EmptyGameDispatcher;
import chess.model.ChessBoard;
import chess.model.Color; import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Game; import chess.model.Game;
@@ -22,7 +21,7 @@ import chess.model.pieces.Pawn;
public class PgnExport { public class PgnExport {
// public static void main(String[] args) { // public static void main(String[] args) {
// final Game game = new Game(new ChessBoard()); // final Game game = new Game();
// final CommandExecutor commandExecutor = new CommandExecutor(game); // final CommandExecutor commandExecutor = new CommandExecutor(game);
// DumbAI ai1 = new DumbAI(commandExecutor, Color.White); // DumbAI ai1 = new DumbAI(commandExecutor, Color.White);
@@ -57,15 +56,15 @@ public class PgnExport {
} }
private static String gameEnd(Game game) { private static String gameEnd(Game game) {
switch (game.checkGameStatus()) { switch (game.checkGameStatus(game.getPlayerTurn())) {
case Draw: case Draw:
case Pat: case Pat:
return "1/2-1/2"; return "1/2-1/2";
case CheckMate: case CheckMate:
if (game.getPlayerTurn() == Color.White) if (game.getPlayerTurn() == Color.White)
return "1-0";
return "0-1"; return "0-1";
return "1-0";
default: default:
return ""; return "";
@@ -138,7 +137,7 @@ public class PgnExport {
} }
private static String checkCheckMate(Game game) { private static String checkCheckMate(Game game) {
switch (game.checkGameStatus()) { switch (game.checkGameStatus(game.getPlayerTurn())) {
case CheckMate: case CheckMate:
return "#"; return "#";
@@ -190,8 +189,7 @@ public class PgnExport {
public static String exportGame(Game game) { public static String exportGame(Game game) {
ChessBoard board = new ChessBoard(); Game virtualGame = new Game();
Game virtualGame = new Game(board);
CommandExecutor executor = new CommandExecutor(virtualGame, new EmptyGameDispatcher()); CommandExecutor executor = new CommandExecutor(virtualGame, new EmptyGameDispatcher());
executor.executeCommand(new NewGameCommand()); executor.executeCommand(new NewGameCommand());

View File

@@ -0,0 +1,29 @@
package chess.simulator;
import chess.controller.CommandExecutor;
import chess.model.Coordinate;
import chess.model.Move;
import java.util.Arrays;
import java.util.List;
public class EnPassantTest extends Simulator{
public EnPassantTest(CommandExecutor commandExecutor) {
super(commandExecutor);
}
@Override
protected List<Move> getMoves() {
return Arrays.asList(
// white pawn
new Move(new Coordinate(4, 6), new Coordinate(4, 4)),
// black pawn 1
new Move(new Coordinate(4, 1), new Coordinate(4, 2)),
// white pawn
new Move(new Coordinate(4, 4), new Coordinate(4, 3)),
// black pawn #2
new Move(new Coordinate(3, 1), new Coordinate(3, 3)));
}
}

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import org.joml.Matrix4f; import org.joml.Matrix4f;
import org.joml.Vector3f; import org.joml.Vector3f;

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL30;

View File

@@ -1,12 +1,11 @@
package chess.view.render; package chess.view.DDDrender;
import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.lwjgl.opengl.*; import org.lwjgl.opengl.GL30;
import chess.model.Coordinate; import chess.view.DDDrender.shader.BoardShader;
import chess.view.render.shader.BoardShader;
import static org.lwjgl.opengl.GL30.*;
public class Renderer { public class Renderer {
private BoardShader shader; private BoardShader shader;
@@ -60,42 +59,16 @@ public class Renderer {
return positions; return positions;
} }
private Coordinate GetCellFromColor(Vector3f color) {
int offset = 1;
if (color.x > 0.5) {
color = new Vector3f(1.0f, 1.0f, 1.0f).sub(color);
offset = 0;
}
int r = (int) (color.x * 255.0f);
int g = (int) (color.y * 255.0f);
int b = (int) (color.z * 255.0f);
int index = (r + g + b) * 2 + offset;
return Coordinate.fromIndex(index);
}
private Vector3f GetCellColor(int x, int y) {
float index = (y * BOARD_WIDTH + x) / 2.0f;
float r = (int) (index / 3) / 255.0f;
float g = (int) ((index + 1) / 3) / 255.0f;
float b = (int) ((index + 2) / 3) / 255.0f;
if ((x + y) % 2 != 0) {
System.out.println(GetCellFromColor(new Vector3f(1.0f - r - 1.0f / 255.0f, 1.0f - g - 1.0f / 255.0f, 1.0f - b - 1.0f / 255.0f)));
return new Vector3f(1.0f - r - 1.0f / 255.0f, 1.0f - g - 1.0f / 255.0f, 1.0f - b - 1.0f / 255.0f);
} else {
System.out.println(GetCellFromColor(new Vector3f(r, g, b)));
return new Vector3f(r, g, b);
}
}
private float[] GetBoardColors() { private float[] GetBoardColors() {
float[] colors = new float[BOARD_SIZE * SQUARE_VERTEX_COUNT * 3]; float[] colors = new float[BOARD_SIZE * SQUARE_VERTEX_COUNT * 3];
for (int j = 0; j < BOARD_HEIGHT; j++) {
for (int i = 0; i < BOARD_WIDTH; i++) { for (int i = 0; i < BOARD_WIDTH; i++) {
Vector3f color = GetCellColor(i, j); for (int j = 0; j < BOARD_HEIGHT; j++) {
Vector3f color;
if ((i + j) % 2 != 0) {
color = new Vector3f(1.0f, 1.0f, 1.0f);
} else {
color = new Vector3f(0.0f, 0.0f, 0.0f);
}
int squareIndex = i * BOARD_WIDTH + j; int squareIndex = i * BOARD_WIDTH + j;
for (int k = 0; k < SQUARE_VERTEX_COUNT; k++) { for (int k = 0; k < SQUARE_VERTEX_COUNT; k++) {
colors[squareIndex * SQUARE_VERTEX_COUNT * 3 + k * 3] = color.x; colors[squareIndex * SQUARE_VERTEX_COUNT * 3 + k * 3] = color.x;
@@ -136,12 +109,6 @@ public class Renderer {
this.vao.Unbind(); this.vao.Unbind();
} }
public Coordinate GetSelectedCell() {
float pixels[] = new float[3];
GL30.glReadPixels(500, 500, 1, 1, GL_RGB, GL_FLOAT, pixels);
return GetCellFromColor(new Vector3f(pixels[0], pixels[1], pixels[2]));
}
public void Render(Camera cam) { public void Render(Camera cam) {
this.shader.Start(); this.shader.Start();
this.shader.SetCamMatrix(cam.getMatrix()); this.shader.SetCamMatrix(cam.getMatrix());

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
public record VertexAttribPointer(int index, int size, int offset) { public record VertexAttribPointer(int index, int size, int offset) {

View File

@@ -1,4 +1,4 @@
package chess.view.render; package chess.view.DDDrender;
import static org.lwjgl.opengl.GL11.GL_FLOAT; import static org.lwjgl.opengl.GL11.GL_FLOAT;

View File

@@ -1,16 +1,10 @@
package chess.view.render; package chess.view.DDDrender;
import org.lwjgl.*; import org.lwjgl.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
import org.lwjgl.opengl.*; import org.lwjgl.opengl.*;
import org.lwjgl.system.*; import org.lwjgl.system.*;
import chess.controller.CommandExecutor;
import chess.controller.event.GameListener;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
import java.nio.*; import java.nio.*;
import static org.lwjgl.glfw.Callbacks.*; import static org.lwjgl.glfw.Callbacks.*;
@@ -19,20 +13,21 @@ import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.system.MemoryStack.*; import static org.lwjgl.system.MemoryStack.*;
import static org.lwjgl.system.MemoryUtil.*; import static org.lwjgl.system.MemoryUtil.*;
public class Window implements GameListener{ public class Window {
// The window handle // The window handle
private long window; private long window;
private final CommandExecutor commandExecutor;
private Renderer renderer; private Renderer renderer;
private Camera cam; private Camera cam;
public Window(CommandExecutor commandExecutor) { public Window() {
this.renderer = new Renderer(); this.renderer = new Renderer();
this.cam = new Camera(); this.cam = new Camera();
this.commandExecutor = new CommandExecutor(); }
public static void main(String[] args) {
new Window().run();
} }
public void run() { public void run() {
@@ -123,8 +118,6 @@ public class Window implements GameListener{
render(); render();
System.out.println(this.renderer.GetSelectedCell());
glfwSwapBuffers(window); // swap the color buffers glfwSwapBuffers(window); // swap the color buffers
// Poll for window events. The key callback above will only be // Poll for window events. The key callback above will only be
@@ -143,82 +136,4 @@ public class Window implements GameListener{
} }
} }
@Override
public void onBoardUpdate() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onBoardUpdate'");
}
@Override
public void onDraw() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onDraw'");
}
@Override
public void onGameEnd() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onGameEnd'");
}
@Override
public void onGameStart() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onGameStart'");
}
@Override
public void onKingInCheck() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onKingInCheck'");
}
@Override
public void onKingInMat() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onKingInMat'");
}
@Override
public void onMove(Move move) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onMove'");
}
@Override
public void onMoveNotAllowed(Move move) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onMoveNotAllowed'");
}
@Override
public void onPatSituation() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onPatSituation'");
}
@Override
public void onPlayerTurn(Color color) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onPlayerTurn'");
}
@Override
public void onPromotePawn(Coordinate pieceCoords) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onPromotePawn'");
}
@Override
public void onSurrender(Color coward) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onSurrender'");
}
@Override
public void onWin(Color winner) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'onWin'");
}
} }

View File

@@ -1,4 +1,4 @@
package chess.view.render.shader; package chess.view.DDDrender.shader;
import org.joml.Matrix4f; import org.joml.Matrix4f;

View File

@@ -1,4 +1,4 @@
package chess.view.render.shader; package chess.view.DDDrender.shader;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;

View File

@@ -0,0 +1,63 @@
package chess.view.audio;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import chess.view.AssetManager;
public class AudioFiles {
private static final String baseURL = "https://images.chesscomfiles.com/chess-themes/sounds/_WAV_/default/";
private static final String[] files = { "game-start", "game-end", "capture", "castle", "move-self",
"move-check", "promote", "illegal" };
private static final String filesExtension = ".wav";
private static final String saveDir = "audio/";
public static boolean initFiles() {
createSaveDir();
for (String file : files) {
if (!initFile(file + filesExtension))
return false;
}
return true;
}
private static boolean downloadFile(String fileName) {
System.out.println("[GameAudio] missing " + fileName + " Downloading ...");
try (BufferedInputStream in = new BufferedInputStream(new URI(baseURL + fileName).toURL().openStream());
FileOutputStream fileOutputStream = new FileOutputStream(saveDir + fileName)) {
byte dataBuffer[] = new byte[1024];
int bytesRead;
while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) {
fileOutputStream.write(dataBuffer, 0, bytesRead);
}
return true;
} catch (IOException | URISyntaxException e) {
e.printStackTrace();
return false;
}
}
private static void createSaveDir() {
new File(saveDir).mkdir();
}
private static boolean initFile(String fileName) {
if (isFileDownloaded(saveDir + fileName))
return true;
return downloadFile(fileName);
}
private static boolean isFileDownloaded(String fileName) {
return AssetManager.getResource(fileName) != null;
}
public static InputStream getAudio(String audioName) {
return AssetManager.getResource(saveDir + audioName + filesExtension);
}
}

View File

@@ -0,0 +1,44 @@
package chess.view.audio;
import java.io.BufferedInputStream;
import java.io.InputStream;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Clip;
public class AudioPlayer {
public static void playSound(InputStream audio) {
new Thread(new Runnable() {
// The wrapper thread is unnecessary, unless it blocks on the
// Clip finishing; see comments.
public void run() {
try {
Clip clip = AudioSystem.getClip();
BufferedInputStream bufferedInputStream = new BufferedInputStream(audio);
AudioInputStream inputStream = AudioSystem.getAudioInputStream(bufferedInputStream);
clip.open(inputStream);
clip.start();
} catch (Exception e) {
System.err.println(e.getMessage());
}
}
}).start();
}
private static AudioInputStream convertToPCM(AudioInputStream audioInputStream) {
AudioFormat m_format = audioInputStream.getFormat();
if ((m_format.getEncoding() != AudioFormat.Encoding.PCM_SIGNED) &&
(m_format.getEncoding() != AudioFormat.Encoding.PCM_UNSIGNED)) {
AudioFormat targetFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED,
m_format.getSampleRate(), 16,
m_format.getChannels(), m_format.getChannels() * 2,
m_format.getSampleRate(), m_format.isBigEndian());
audioInputStream = AudioSystem.getAudioInputStream(targetFormat, audioInputStream);
}
return audioInputStream;
}
}

View File

@@ -0,0 +1,63 @@
package chess.view.audio;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.controller.event.GameAdaptator;
import chess.model.Move;
public class GameAudio extends GameAdaptator {
private final boolean functional;
public GameAudio() {
this.functional = AudioFiles.initFiles();
if(!this.functional){
System.err.println("[GameAudio] Failed to initialize audio files. Aborting ...");
}
}
private void playSound(String soundName) {
if (!this.functional)
return;
AudioPlayer.playSound(AudioFiles.getAudio(soundName));
}
@Override
public void onGameStart() {
playSound("game-start");
}
@Override
public void onGameEnd() {
playSound("game-end");
}
@Override
public void onMoveNotAllowed(Move move) {
playSound("illegal");
}
@Override
public void onMove(Move move, boolean captured) {
if (captured) {
playSound("capture");
return;
}
playSound("move-self");
}
@Override
public void onKingInCheck() {
playSound("move-check");
}
@Override
public void onPawnPromoted(PromoteType promotion) {
playSound("promote");
}
@Override
public void onCastling(boolean bigCastling) {
playSound("castle");
}
}

View File

@@ -20,12 +20,17 @@ public class Console implements GameListener {
private final Scanner scanner = new Scanner(System.in); private final Scanner scanner = new Scanner(System.in);
private final CommandExecutor commandExecutor; private final CommandExecutor commandExecutor;
private final ConsolePieceName consolePieceName = new ConsolePieceName(); private final ConsolePieceName consolePieceName = new ConsolePieceName();
private boolean captureInput = false; private boolean captureInput;
private final ExecutorService executor; private final ExecutorService executor;
public Console(CommandExecutor commandExecutor) { public Console(CommandExecutor commandExecutor, boolean captureInput) {
this.commandExecutor = commandExecutor; this.commandExecutor = commandExecutor;
this.executor = Executors.newSingleThreadExecutor(); this.executor = Executors.newSingleThreadExecutor();
this.captureInput = captureInput;
}
public Console(CommandExecutor commandExecutor) {
this(commandExecutor, true);
} }
private Piece pieceAt(int x, int y) { private Piece pieceAt(int x, int y) {
@@ -61,7 +66,7 @@ public class Console implements GameListener {
} }
@Override @Override
public void onPlayerTurn(Color color) { public void onPlayerTurn(Color color, boolean undone) {
if (!captureInput) if (!captureInput)
return; return;
System.out.println(Colors.RED + "Player turn: " + color + Colors.RESET); System.out.println(Colors.RED + "Player turn: " + color + Colors.RESET);
@@ -265,7 +270,7 @@ public class Console implements GameListener {
} }
@Override @Override
public void onMove(Move move) { public void onMove(Move move, boolean captured) {
} }
@Override @Override
@@ -328,4 +333,11 @@ public class Console implements GameListener {
this.captureInput = captureInput; this.captureInput = captureInput;
} }
@Override
public void onCastling(boolean bigCastling) {}
@Override
public void onPawnPromoted(PromoteType promotion) {}
} }

View File

@@ -74,15 +74,15 @@ public class Window extends JFrame implements GameListener {
} }
private void buildButtons(JPanel bottom) { private void buildButtons(JPanel bottom) {
castlingButton.addActionListener((event) -> { castlingButton.addActionListener((_) -> {
sendCommand(new CastlingCommand(false)); sendCommand(new CastlingCommand(false));
}); });
bigCastlingButton.addActionListener((event) -> { bigCastlingButton.addActionListener((_) -> {
sendCommand(new CastlingCommand(true)); sendCommand(new CastlingCommand(true));
}); });
undoButton.addActionListener((event) -> { undoButton.addActionListener((_) -> {
sendCommand(new UndoCommand()); sendCommand(new UndoCommand());
}); });
@@ -213,7 +213,7 @@ public class Window extends JFrame implements GameListener {
} }
@Override @Override
public void onPlayerTurn(chess.model.Color color) { public void onPlayerTurn(chess.model.Color color, boolean undone) {
this.displayText.setText("Current turn: " + color); this.displayText.setText("Current turn: " + color);
updateButtons(); updateButtons();
} }
@@ -306,7 +306,7 @@ public class Window extends JFrame implements GameListener {
} }
@Override @Override
public void onMove(Move move) {} public void onMove(Move move, boolean captured) {}
@Override @Override
public void onMoveNotAllowed(Move move) { public void onMoveNotAllowed(Move move) {
@@ -318,4 +318,10 @@ public class Window extends JFrame implements GameListener {
JOptionPane.showMessageDialog(this, "Same position was repeated three times. It's a draw!"); JOptionPane.showMessageDialog(this, "Same position was repeated three times. It's a draw!");
} }
@Override
public void onCastling(boolean bigCastling) {}
@Override
public void onPawnPromoted(PromoteType promotion) {}
} }

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9de4cc336a3758a7285ca5dcc5c01409f1ff5d50e764f38857cdf5900590751
size 1862504

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3fba82d694608f48ba85224f9d1099ae6d884b4588e1e9b355b136824ba12993
size 38924264

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e2b10052a3e58ff14020f737c4493266a9fae7bd8318527ebf32cddfb97b21fe
size 40833600

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6782c2627d0de0de695baaeaca286da3c77f443cc5788d8c3a0057406296776
size 3503068

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b714c3884dbcb0c8863ae8583c9dd61b5a3c4531e38bb5af8a403d7b69f52183
size 2249344

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3ebb87642f2f7f205dbfac65ed2bdef1ab4f4b67cf9929619d2e681004655cc
size 15926128

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c58aaab69205d56e6f41f94dc2c4e759d2d7cd43fa4fdd7cf615d21a6f18c30f
size 5458016

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2929607904bde363cbd4fc3766ba2f9a55b7d37f5e6d0c8ad6995dc311775a7
size 10249428

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81da4beec7bf500fea31b5626c58edc2d9f575b3d5ef743b16854ca40e9d86c8
size 2110080

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d812a5ddd17844e71fa8216722413065b46b12ce37f9d5591d6120e29393686
size 25214944

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56f9ca7da9758b8f4801a829cf92b03c4ee3fbf4d306e55f1526236a12a8931d
size 9602776

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0cd5999920bf1919a6c37fbb3405272fe8721e915f3fd1dac9114a154cf23898
size 19819784

View File

@@ -0,0 +1,12 @@
1. e4 {1.e4 $1 A fiery start $1} 1... e5 {I like how this game is starting $1} 2. Nc3
Bc5 {J'aime un feu chaud.} 3. Nf3 {It's too cold in here for my liking.} 3...
Qf6 4. Nd5 Qd6 5. d3 c6 {A fiery position is what I seek $1} 6. Nc3 h6 7. a3 Qg6
8. Nxe5 {Things are beginning to heat up, non $2} 8... Qd6 9. Nc4 Qe6 10. d4 Be7
11. Ne3 b5 12. Nf5 d5 13. Nxg7+ {That's not very nice.} 13... Kd7 14. Nxe6
{Brrrrrr. It is getting cold in here.} 14... fxe6 15. exd5 cxd5 16. Bf4 Nf6 17.
Bxb5+ Kd8 18. Qf3 Bd7 19. Be5 {My attack is getting cold, I need to go get some
more firewood $1} 19... a6 20. Bxf6 Re8 21. Bxe7+ Kxe7 22. Nxd5+ exd5 23. Qxd5
Kf8+ {It's getting toasty in here $1} 24. Be2 Bc6 25. Qd6+ Re7 26. Kf1 Ba4 27. b3
Nc6 28. bxa4 a5 29. Qxc6 Rd8 30. Qxh6+ Kg8 31. Bc4+ Rf7 32. Qg5+ Kh8 33. Bxf7
{C'est très, très mauvais $1} 33... Kh7 34. Qg6+ Kh8 35. Ra2 Rxd4 36. Qg8# {Good
play $1 I'll have to throw another log on the fire and try again.} 1-0

View File

@@ -3,24 +3,20 @@
*/ */
package chess; package chess;
import org.junit.jupiter.api.Test;
import chess.ai.DumbAI; import chess.ai.DumbAI;
import chess.controller.Command; import chess.controller.Command;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
import chess.controller.commands.UndoCommand; import chess.controller.commands.UndoCommand;
import chess.controller.event.GameAdaptator; import chess.controller.event.GameAdaptator;
import chess.model.*; import chess.model.Color;
import chess.model.pieces.*; import chess.model.Game;
import chess.simulator.Simulator;
import chess.view.simplerender.Window;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Objects;
class AppTest { class AppTest {
@Test void functionalRollback(){ @Test void functionalRollback(){
Game game = new Game(new ChessBoard()); Game game = new Game();
CommandExecutor commandExecutor = new CommandExecutor(game); CommandExecutor commandExecutor = new CommandExecutor(game);
DumbAI ai = new DumbAI(commandExecutor, Color.Black); DumbAI ai = new DumbAI(commandExecutor, Color.Black);
@@ -38,9 +34,9 @@ class AppTest {
result = commandExecutor.executeCommand(new UndoCommand()); result = commandExecutor.executeCommand(new UndoCommand());
} while (result != Command.CommandResult.NotAllowed); } while (result != Command.CommandResult.NotAllowed);
Game initialGame = new Game(new ChessBoard()); Game initialGame = new Game();
CommandExecutor initialCommandExecutor = new CommandExecutor(initialGame); CommandExecutor initialCommandExecutor = new CommandExecutor(initialGame);
commandExecutor.executeCommand(new NewGameCommand()); initialCommandExecutor.executeCommand(new NewGameCommand());
assert(game.getBoard().equals(initialGame.getBoard())); assert(game.getBoard().equals(initialGame.getBoard()));