Added en passant availability logging and FEN string export
This commit is contained in:
parent
6dd517fbfe
commit
490d42548c
@ -458,11 +458,11 @@ public class Board implements Cloneable {
|
|||||||
if (castlingSb.length() == 0) sb.append("-");
|
if (castlingSb.length() == 0) sb.append("-");
|
||||||
sb.append(castlingSb);
|
sb.append(castlingSb);
|
||||||
|
|
||||||
// TODO: en passant availability
|
|
||||||
sb.append(" -");
|
|
||||||
|
|
||||||
final LoggedMove lastMove = log.getLast();
|
final LoggedMove lastMove = log.getLast();
|
||||||
|
|
||||||
|
// En passant availabillity
|
||||||
|
sb.append(" " + (lastMove == null || lastMove.enPassant == null ? "-" : lastMove.enPassant.toSAN()));
|
||||||
|
|
||||||
// Halfmove clock
|
// Halfmove clock
|
||||||
sb.append(" " + String.valueOf(lastMove == null ? 0 : lastMove.halfmoveClock));
|
sb.append(" " + String.valueOf(lastMove == null ? 0 : lastMove.halfmoveClock));
|
||||||
|
|
||||||
|
@ -22,6 +22,11 @@ public class Log implements Cloneable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void add(Move move, Piece capturedPiece, boolean pawnMove) {
|
public void add(Move move, Piece capturedPiece, boolean pawnMove) {
|
||||||
|
// En passant availability
|
||||||
|
Position enPassant = null;
|
||||||
|
if (pawnMove && move.yDist == 2) enPassant = new Position(move.pos.x, move.pos.y + move.ySign);
|
||||||
|
|
||||||
|
// Fullmove counter and halfmove clock
|
||||||
int fullmoveCounter, halfmoveClock;
|
int fullmoveCounter, halfmoveClock;
|
||||||
if (moves.isEmpty()) {
|
if (moves.isEmpty()) {
|
||||||
fullmoveCounter = 1;
|
fullmoveCounter = 1;
|
||||||
@ -32,7 +37,7 @@ public class Log implements Cloneable {
|
|||||||
halfmoveClock = capturedPiece != null || pawnMove ? 0 : getLast().halfmoveClock + 1;
|
halfmoveClock = capturedPiece != null || pawnMove ? 0 : getLast().halfmoveClock + 1;
|
||||||
}
|
}
|
||||||
activeColor = activeColor.opposite();
|
activeColor = activeColor.opposite();
|
||||||
moves.add(new LoggedMove(move, capturedPiece, fullmoveCounter, halfmoveClock));
|
moves.add(new LoggedMove(move, capturedPiece, enPassant, fullmoveCounter, halfmoveClock));
|
||||||
}
|
}
|
||||||
|
|
||||||
public LoggedMove getLast() { return moves.isEmpty() ? null : moves.get(moves.size() - 1); }
|
public LoggedMove getLast() { return moves.isEmpty() ? null : moves.get(moves.size() - 1); }
|
||||||
@ -63,11 +68,13 @@ public class Log implements Cloneable {
|
|||||||
|
|
||||||
public final Move move;
|
public final Move move;
|
||||||
public final Piece capturedPiece;
|
public final Piece capturedPiece;
|
||||||
|
public final Position enPassant;
|
||||||
public final int fullmoveCounter, halfmoveClock;
|
public final int fullmoveCounter, halfmoveClock;
|
||||||
|
|
||||||
public LoggedMove(Move move, Piece capturedPiece, int fullmoveCounter, int halfmoveClock) {
|
public LoggedMove(Move move, Piece capturedPiece, Position enPassant, int fullmoveCounter, int halfmoveClock) {
|
||||||
this.move = move;
|
this.move = move;
|
||||||
this.capturedPiece = capturedPiece;
|
this.capturedPiece = capturedPiece;
|
||||||
|
this.enPassant = enPassant;
|
||||||
this.fullmoveCounter = fullmoveCounter;
|
this.fullmoveCounter = fullmoveCounter;
|
||||||
this.halfmoveClock = halfmoveClock;
|
this.halfmoveClock = halfmoveClock;
|
||||||
}
|
}
|
||||||
|
@ -30,9 +30,9 @@ public class Move {
|
|||||||
this(new Position(xPos, yPos), new Position(xDest, yDest));
|
this(new Position(xPos, yPos), new Position(xDest, yDest));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Move fromAlgebraicNotation(String move) {
|
public static Move fromSAN(String move) {
|
||||||
return new Move(Position.fromAlgebraicNotation(move.substring(0, 2)),
|
return new Move(Position.fromSAN(move.substring(0, 2)),
|
||||||
Position.fromAlgebraicNotation(move.substring(2)));
|
Position.fromSAN(move.substring(2)));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isHorizontal() { return yDist == 0; }
|
public boolean isHorizontal() { return yDist == 0; }
|
||||||
|
@ -15,8 +15,12 @@ public class Position {
|
|||||||
this.y = y;
|
this.y = y;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Position fromAlgebraicNotation(String pos) {
|
public static Position fromSAN(String pos) {
|
||||||
return new Position(pos.charAt(0) - 97, 7 - (Character.getNumericValue(pos.charAt(1)) - 1));
|
return new Position(pos.charAt(0) - 97, 8 - Character.getNumericValue(pos.charAt(1)));
|
||||||
|
}
|
||||||
|
|
||||||
|
public String toSAN() {
|
||||||
|
return String.valueOf((char) (x + 97)) + String.valueOf(8 - y);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -74,7 +74,7 @@ public class UCIPlayer extends Player implements UCIListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBestMove(String move) {
|
public void onBestMove(String move) {
|
||||||
Move moveObj = Move.fromAlgebraicNotation(move);
|
Move moveObj = Move.fromSAN(move);
|
||||||
game.onMove(this, moveObj);
|
game.onMove(this, moveObj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
52
test/dev/kske/chess/test/PositionTest.java
Normal file
52
test/dev/kske/chess/test/PositionTest.java
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
package dev.kske.chess.test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.IntStream;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import dev.kske.chess.board.Position;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project: <strong>Chess</strong><br>
|
||||||
|
* File: <strong>PositionTest.java</strong><br>
|
||||||
|
* Created: <strong>24.07.2019</strong><br>
|
||||||
|
* Author: <strong>Kai S. K. Engelbart</strong>
|
||||||
|
*/
|
||||||
|
class PositionTest {
|
||||||
|
|
||||||
|
List<Position> positions;
|
||||||
|
List<String> sans;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws java.lang.Exception
|
||||||
|
*/
|
||||||
|
@BeforeEach
|
||||||
|
void setUp() throws Exception {
|
||||||
|
positions = Arrays.asList(new Position(0, 0), new Position(7, 7), new Position(0, 7), new Position(7, 0));
|
||||||
|
sans = Arrays.asList("a8", "h1", "a1", "h8");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test method for
|
||||||
|
* {@link dev.kske.chess.board.Position#fromSAN(java.lang.String)}.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
void testFromSAN() {
|
||||||
|
IntStream.range(0, positions.size())
|
||||||
|
.forEach(i -> assertEquals(positions.get(i), Position.fromSAN(sans.get(i))));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test method for {@link dev.kske.chess.board.Position#toSAN()}.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
void testToSAN() {
|
||||||
|
IntStream.range(0, positions.size()).forEach(i -> assertEquals(sans.get(i), positions.get(i).toSAN()));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user