1 Commits

Author SHA1 Message Date
3ac7b4ad65 i failed you 2025-04-16 19:03:55 +02:00
33 changed files with 409 additions and 1020 deletions

View File

@@ -39,10 +39,6 @@ application {
applicationName = "3DChess" applicationName = "3DChess"
} }
run {
standardInput = System.in
}
jar { jar {
manifest { manifest {
attributes 'Main-Class': application.mainClass attributes 'Main-Class': application.mainClass

View File

@@ -5,17 +5,26 @@ 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(); Game game = new Game(new ChessBoard());
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

@@ -0,0 +1,33 @@
package chess;
import chess.ai.DumbAI;
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 static void main(String[] args) {
Game game = new Game(new ChessBoard());
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,10 +1,10 @@
package chess; package chess;
import chess.ai.AI; import chess.ai.DumbAI;
import chess.ai.minimax.AlphaBetaAI;
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;
@@ -12,20 +12,17 @@ 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(); Game game = new Game(new ChessBoard());
CommandExecutor commandExecutor = new CommandExecutor(game); CommandExecutor commandExecutor = new CommandExecutor(game);
Window window = new Window(commandExecutor, false); Window window = new Window(commandExecutor, false);
commandExecutor.addListener(window); commandExecutor.addListener(window);
AI ai = new AlphaBetaAI(commandExecutor, Color.Black, 5); DumbAI ai = new DumbAI(commandExecutor, Color.Black);
commandExecutor.addListener(ai); commandExecutor.addListener(ai);
// AI ai2 = new AlphaBetaAI(commandExecutor, Color.White, 5); DumbAI ai2 = new DumbAI(commandExecutor, Color.White);
// commandExecutor.addListener(ai2); commandExecutor.addListener(ai2);
// Window window2 = new Window(ai2.getSimulation(), false);
// ai2.getSimulation().addListener(window2);
commandExecutor.addListener(new GameAdaptator(){ commandExecutor.addListener(new GameAdaptator(){
@Override @Override

View File

@@ -1,81 +0,0 @@
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,28 +3,46 @@ 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.CastlingResult; import chess.controller.commands.GetAllowedCastlingsCommand;
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 AI { public class DumbAI extends GameAdaptator {
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) {
super(commandExecutor, color); this.player = color;
this.commandExecutor = commandExecutor;
} }
@Override @Override
protected void play() { public void onPlayerTurn(Color color) {
CastlingResult castlings = getAllowedCastlings(); if (color != player)
List<Move> moves = getAllowedMoves(); return;
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: {
@@ -35,12 +53,20 @@ public class DumbAI extends AI {
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(castlings == CastlingResult.Big)); this.commandExecutor.executeCommand(new CastlingCommand(true));
return; return;
} }
@@ -50,12 +76,27 @@ public class DumbAI extends AI {
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
protected void promote(Coordinate pawnCoords) { public void onPromotePawn(Coordinate pieceCoords) {
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

@@ -1,61 +0,0 @@
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

@@ -1,67 +0,0 @@
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

@@ -1,129 +0,0 @@
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

@@ -1,89 +0,0 @@
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;
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 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;
System.out.println("Evaluating " + moves.size() + " moves ...");
for (Move move : moves) {
moveEvaluations.add(this.threadPool.submit(() -> {
return AlphaBetaThreadCreator.getMoveValue(move, this.searchDepth);
}));
}
for (int i = 0; i < moves.size(); i++) {
System.out.printf("Progress : %.2f %% ", (float) (i) / moves.size() * 100.0f);
Move move = moves.get(i);
System.out.print("\r");
float value = MIN_FLOAT;
try {
value = moveEvaluations.get(i).get();
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
if (value > bestMoveValue) {
bestMoveValue = value;
bestMove = move;
}
}
System.out.println("Best move : " + bestMoveValue + " ");
return bestMove;
}
@Override
public void onGameEnd() {
this.threadPool.close();
}
@Override
protected void play() {
long current = System.currentTimeMillis();
Move move = getBestMove();
long elapsed = System.currentTimeMillis() - current;
System.out.println("Took " + elapsed + "ms");
sendCommand(new MoveCommand(move));
}
@Override
protected void promote(Coordinate pawnCoords) {
sendCommand(new PromoteCommand(PromoteType.Queen));
}
}

View File

@@ -1,101 +0,0 @@
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

@@ -1,36 +0,0 @@
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

@@ -1,97 +0,0 @@
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) {
sendCommand(new MoveCommand(move));
}
@Override
public void onGameStart() {
sendCommand(new NewGameCommand());
}
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,7 +2,6 @@ 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;
@@ -18,7 +17,7 @@ public class CommandExecutor {
} }
public CommandExecutor(Game game) { public CommandExecutor(Game game) {
this(game, new AsyncGameDispatcher()); this(game, new GameDispatcher());
} }
public CommandExecutor(Game game, GameDispatcher dispatcher) { public CommandExecutor(Game game, GameDispatcher dispatcher) {
@@ -53,21 +52,19 @@ public class CommandExecutor {
return; return;
case Moved: case Moved:
boolean notifyPlayerTurn = true;
this.dispatcher.onBoardUpdate(); this.dispatcher.onBoardUpdate();
if (!(command instanceof UndoCommand) && checkGameStatus()) { if (checkGameStatus()) {
this.dispatcher.onGameEnd(); this.dispatcher.onGameEnd();
notifyPlayerTurn = false; return;
} }
switchPlayerTurn(command instanceof UndoCommand, notifyPlayerTurn); switchPlayerTurn();
return; return;
} }
} }
private void switchPlayerTurn(boolean undone, boolean notifyPlayerTurn) { private void switchPlayerTurn() {
this.game.switchPlayerTurn(); this.game.switchPlayerTurn();
if (notifyPlayerTurn) this.dispatcher.onPlayerTurn(this.game.getPlayerTurn());
this.dispatcher.onPlayerTurn(this.game.getPlayerTurn(), undone);
} }
/** /**
@@ -110,6 +107,6 @@ public class CommandExecutor {
} }
public void close() { public void close() {
this.dispatcher.close(); this.dispatcher.stopService();
} }
} }

View File

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

View File

@@ -37,6 +37,7 @@ 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;
@@ -52,7 +53,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 (game.pawnShouldBePromoted()) if (board.pawnShouldBePromoted())
return CommandResult.NotAllowed; return CommandResult.NotAllowed;
Piece piece = board.pieceAt(move.getStart()); Piece piece = board.pieceAt(move.getStart());
@@ -75,14 +76,11 @@ public class MoveCommand extends PlayerCommand {
} }
if (tryPromote(game, outputSystem)) { if (tryPromote(game, outputSystem)) {
outputSystem.onMove(this.move);
return CommandResult.ActionNeeded; return CommandResult.ActionNeeded;
} }
board.setLastMove(this.move); board.setLastMove(this.move);
outputSystem.onMove(this.move);
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(), false); outputSystem.onPlayerTurn(game.getPlayerTurn());
return CommandResult.NotMoved; return CommandResult.NotMoved;
} }

View File

@@ -55,8 +55,6 @@ 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

@@ -1,113 +0,0 @@
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) {
asyncForEachCall((l) -> l.onMove(move));
}
@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,6 +1,5 @@
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;
@@ -44,7 +43,7 @@ public class EmptyGameDispatcher extends GameDispatcher {
} }
@Override @Override
public void onPlayerTurn(Color color, boolean undone) { public void onPlayerTurn(Color color) {
} }
@Override @Override
@@ -59,20 +58,4 @@ 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,6 +1,5 @@
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;
@@ -8,7 +7,7 @@ import chess.model.Move;
public abstract class GameAdaptator implements GameListener { public abstract class GameAdaptator implements GameListener {
@Override @Override
public void onPlayerTurn(Color color, boolean undone) {} public void onPlayerTurn(Color color) {}
@Override @Override
public void onWin(Color color) {} public void onWin(Color color) {}
@@ -46,10 +45,4 @@ 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,9 +1,100 @@
package chess.controller.event; package chess.controller.event;
public abstract class GameDispatcher extends GameAdaptator { import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.Consumer;
public abstract void addListener(GameListener listener); import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
public abstract void close(); public class GameDispatcher implements GameListener {
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,6 +1,5 @@
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;
@@ -39,14 +38,12 @@ 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
*/ */
void onMove(Move move); void onMove(Move move);
/** /**
* 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);
@@ -58,46 +55,26 @@ 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, boolean undone); void onPlayerTurn(Color color);
/** /**
* 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.pieces.King; import chess.model.visitor.KingIdentifier;
import chess.model.visitor.PawnIdentifier; import chess.model.visitor.PawnIdentifier;
import chess.model.visitor.PiecePathChecker; import chess.model.visitor.PiecePathChecker;
@@ -31,10 +31,6 @@ 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++) {
@@ -45,7 +41,6 @@ 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) {
@@ -103,8 +98,6 @@ 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) {
@@ -112,19 +105,18 @@ 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) {
@@ -135,7 +127,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 || attackPiece.getColor() == color) if (attackPiece == null)
continue; continue;
PiecePathChecker checker = new PiecePathChecker(this, new Move(attackCoords, kingPos)); PiecePathChecker checker = new PiecePathChecker(this, new Move(attackCoords, kingPos));
@@ -151,10 +143,6 @@ 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++) {
@@ -171,11 +159,6 @@ 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())
@@ -189,7 +172,6 @@ public class ChessBoard {
} }
} }
} }
this.cachedAllowedMoves = result;
return result; return result;
} }
@@ -318,11 +300,10 @@ 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() { public Game(ChessBoard board) {
this.board = new ChessBoard(); this.board = board;
this.movesHistory = new Stack<>(); this.movesHistory = new Stack<>();
this.traitsPos = new HashMap<>(); this.traitsPos = new HashMap<>();
} }
@@ -70,27 +70,24 @@ public class Game {
playerTurn = Color.getEnemy(playerTurn); playerTurn = Color.getEnemy(playerTurn);
} }
// this is the bottleneck of algorithms using this chess engine public GameStatus checkGameStatus() {
public GameStatus checkGameStatus(Color color) { final Color enemy = Color.getEnemy(getPlayerTurn());
if (checkDraw()) if (checkDraw())
return GameStatus.Draw; return GameStatus.Draw;
if (this.board.isKingInCheck(color)) if (this.board.isKingInCheck(enemy))
if (this.board.hasAllowedMoves(color)) if (this.board.hasAllowedMoves(enemy))
return GameStatus.Check; return GameStatus.Check;
else else
return GameStatus.CheckMate; return GameStatus.CheckMate;
if (!board.hasAllowedMoves(color)) if (!board.hasAllowedMoves(enemy))
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);
} }
@@ -122,8 +119,4 @@ public class Game {
return this.movesHistory; return this.movesHistory;
} }
public boolean pawnShouldBePromoted() {
return this.board.pawnShouldBePromoted();
}
} }

View File

@@ -1,20 +0,0 @@
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,6 +11,7 @@ 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;
@@ -21,7 +22,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(); // final Game game = new Game(new ChessBoard());
// 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);
@@ -56,15 +57,15 @@ public class PgnExport {
} }
private static String gameEnd(Game game) { private static String gameEnd(Game game) {
switch (game.checkGameStatus(game.getPlayerTurn())) { switch (game.checkGameStatus()) {
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 "0-1";
return "1-0"; return "1-0";
return "0-1";
default: default:
return ""; return "";
@@ -137,7 +138,7 @@ public class PgnExport {
} }
private static String checkCheckMate(Game game) { private static String checkCheckMate(Game game) {
switch (game.checkGameStatus(game.getPlayerTurn())) { switch (game.checkGameStatus()) {
case CheckMate: case CheckMate:
return "#"; return "#";
@@ -189,7 +190,8 @@ public class PgnExport {
public static String exportGame(Game game) { public static String exportGame(Game game) {
Game virtualGame = new Game(); ChessBoard board = new ChessBoard();
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

@@ -20,17 +20,12 @@ 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; private boolean captureInput = false;
private final ExecutorService executor; private final ExecutorService executor;
public Console(CommandExecutor commandExecutor, boolean captureInput) { public Console(CommandExecutor commandExecutor) {
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) {
@@ -66,7 +61,7 @@ public class Console implements GameListener {
} }
@Override @Override
public void onPlayerTurn(Color color, boolean undone) { public void onPlayerTurn(Color color) {
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);
@@ -333,11 +328,4 @@ 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

@@ -3,6 +3,7 @@ package chess.view.render;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.lwjgl.opengl.*; import org.lwjgl.opengl.*;
import chess.model.Coordinate;
import chess.view.render.shader.BoardShader; import chess.view.render.shader.BoardShader;
import static org.lwjgl.opengl.GL30.*; import static org.lwjgl.opengl.GL30.*;
@@ -59,16 +60,42 @@ 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 i = 0; i < BOARD_WIDTH; i++) {
for (int j = 0; j < BOARD_HEIGHT; j++) { for (int j = 0; j < BOARD_HEIGHT; j++) {
Vector3f color; for (int i = 0; i < BOARD_WIDTH; i++) {
if ((i + j) % 2 != 0) { Vector3f color = GetCellColor(i, j);
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;
@@ -109,6 +136,12 @@ 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

@@ -5,6 +5,12 @@ 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.*;
@@ -13,17 +19,20 @@ 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 { public class Window implements GameListener{
// 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() { public Window(CommandExecutor commandExecutor) {
this.renderer = new Renderer(); this.renderer = new Renderer();
this.cam = new Camera(); this.cam = new Camera();
this.commandExecutor = new CommandExecutor();
} }
public void run() { public void run() {
@@ -114,6 +123,8 @@ public class Window {
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
@@ -132,4 +143,82 @@ public class Window {
} }
} }
@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

@@ -213,7 +213,7 @@ public class Window extends JFrame implements GameListener {
} }
@Override @Override
public void onPlayerTurn(chess.model.Color color, boolean undone) { public void onPlayerTurn(chess.model.Color color) {
this.displayText.setText("Current turn: " + color); this.displayText.setText("Current turn: " + color);
updateButtons(); updateButtons();
} }
@@ -318,10 +318,4 @@ 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

@@ -1,12 +0,0 @@
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,20 +3,24 @@
*/ */
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.Color; import chess.model.*;
import chess.model.Game; import chess.model.pieces.*;
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(); Game game = new Game(new ChessBoard());
CommandExecutor commandExecutor = new CommandExecutor(game); CommandExecutor commandExecutor = new CommandExecutor(game);
DumbAI ai = new DumbAI(commandExecutor, Color.Black); DumbAI ai = new DumbAI(commandExecutor, Color.Black);
@@ -34,9 +38,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(); Game initialGame = new Game(new ChessBoard());
CommandExecutor initialCommandExecutor = new CommandExecutor(initialGame); CommandExecutor initialCommandExecutor = new CommandExecutor(initialGame);
initialCommandExecutor.executeCommand(new NewGameCommand()); commandExecutor.executeCommand(new NewGameCommand());
assert(game.getBoard().equals(initialGame.getBoard())); assert(game.getBoard().equals(initialGame.getBoard()));