Track half-move and full-move clocks in MinChess. Update related classes and add tests for clock functionality.

Author: mcoria

src/main/java/net/chesstango/gardel/minchess/MinChess.java

@@ -33,6 +33,8 @@ public MinChess(boolean whiteTurn,
                     boolean castlingWhiteKingAllowed,
                     boolean castlingWhiteQueenAllowed,
                     long enPassantSquare,
+                    int halfMoveClock,
+                    int fullMoveClock,
                     long whitePositions,
                     long blackPositions,
                     long kingPositions,
@@ -48,6 +50,8 @@ public MinChess(boolean whiteTurn,
                 castlingWhiteKingAllowed,
                 castlingWhiteQueenAllowed,
                 enPassantSquare,
+                halfMoveClock,
+                fullMoveClock,
                 whitePositions,
                 blackPositions,
                 kingPositions,
@@ -184,6 +188,8 @@ public MinChess clone() {
                 workspace.castlingWhiteKingAllowed,
                 workspace.castlingWhiteQueenAllowed,
                 workspace.enPassantSquare,
+                workspace.halfMoveClock,
+                workspace.fullMoveClock,
                 workspace.whitePositions,
                 workspace.blackPositions,
                 workspace.kingPositions,
@@ -224,6 +230,14 @@ public boolean getTurn() {
         return workspace.whiteTurn;
     }
 
+    public int getHalfMoveClock() {
+        return workspace.halfMoveClock;
+    }
+
+    public int getFullMoveClock() {
+        return workspace.fullMoveClock;
+    }
+
     public static MinChess from(FEN fen) {
         MinChessBuilder builder = new MinChessBuilder();
         fen.export(builder);

src/main/java/net/chesstango/gardel/minchess/MinChessBuilder.java

@@ -16,6 +16,8 @@ public MinChess getPositionRepresentation() {
                 castlingWhiteKingAllowed,
                 castlingWhiteQueenAllowed,
                 enPassantSquare,
+                halfMoveClock,
+                fullMoveClock,
                 whitePositions,
                 blackPositions,
                 kingPositions,

src/main/java/net/chesstango/gardel/minchess/MinChessExporter.java

@@ -23,6 +23,8 @@ public void export(MinChess minChess) {
         this.positionBuilder.withCastlingBlackQueenAllowed(workspace.castlingBlackQueenAllowed);
         this.positionBuilder.withCastlingWhiteKingAllowed(workspace.castlingWhiteKingAllowed);
         this.positionBuilder.withCastlingWhiteQueenAllowed(workspace.castlingWhiteQueenAllowed);
+        this.positionBuilder.withHalfMoveClock(workspace.halfMoveClock);
+        this.positionBuilder.withFullMoveClock(workspace.fullMoveClock);
 
         if (workspace.enPassantSquare != 0) {
             final int enPassantSquareIdx = Long.numberOfTrailingZeros(workspace.enPassantSquare);

src/main/java/net/chesstango/gardel/minchess/MinChessWorkspace.java

@@ -11,6 +11,8 @@ class MinChessWorkspace {
     boolean castlingBlackQueenAllowed;
     boolean castlingWhiteKingAllowed;
     boolean castlingWhiteQueenAllowed;
+    int halfMoveClock;
+    int fullMoveClock;
 
     long enPassantSquare = 0;
     long whitePositions = 0;
@@ -29,6 +31,8 @@ class MinChessWorkspace {
                       boolean castlingWhiteKingAllowed,
                       boolean castlingWhiteQueenAllowed,
                       long enPassantSquare,
+                      int halfMoveClock,
+                      int fullMoveClock,
                       long whitePositions,
                       long blackPositions,
                       long kingPositions,
@@ -44,6 +48,9 @@ class MinChessWorkspace {
         this.castlingWhiteKingAllowed = castlingWhiteKingAllowed;
         this.castlingWhiteQueenAllowed = castlingWhiteQueenAllowed;
         this.enPassantSquare = enPassantSquare;
+        this.halfMoveClock = halfMoveClock;
+        this.fullMoveClock = fullMoveClock;
+
         this.whitePositions = whitePositions;
         this.blackPositions = blackPositions;
 
@@ -79,6 +86,7 @@ void copyFrom(MinChessWorkspace other) {
     }
 
     void doMoveImp(long from, long to) {
+        halfMoveClock++;
         // Capture, clean to square
         if ((to & whitePositions) != 0 || (to & blackPositions) != 0) {
             if ((to & queenPositions) != 0) {
@@ -110,6 +118,7 @@ void doMoveImp(long from, long to) {
             } else {
                 whitePositions &= ~to;
             }
+            halfMoveClock = 0;
         }
 
         if ((from & kingPositions) != 0) {
@@ -151,6 +160,7 @@ void doMoveImp(long from, long to) {
         if ((from & pawnPositions) != 0) {
             pawnPositions &= ~from;
             pawnPositions |= to;
+            halfMoveClock = 0;
         }
 
         enPassantSquare = 0;
@@ -161,7 +171,9 @@ void doMoveImp(long from, long to) {
         } else {
             blackPositions &= ~from;
             blackPositions |= to;
+            fullMoveClock++;
         }
+
         whiteTurn = !whiteTurn;
     }
 

src/test/java/net/chesstango/gardel/minchess/ClockTest.java

@@ -0,0 +1,37 @@
+package net.chesstango.gardel.minchess;
+
+import net.chesstango.gardel.fen.FEN;
+import org.junit.jupiter.api.Test;
+
+import static net.chesstango.gardel.minchess.MinChessConstants.encodeMove;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Mauricio Coria
+ */
+public class ClockTest {
+
+    @Test
+    public void test_START_POSITION() {
+        MinChess game = MinChess.from(FEN.START_POSITION);
+
+        assertTrue(game.getTurn());
+        assertEquals(0, game.getHalfMoveClock());
+        assertEquals(1, game.getFullMoveClock());
+
+        assertEquals(FEN.START_POSITION, game.toFEN());
+    }
+
+    @Test
+    public void test_START_POSITION_a2a4() {
+        MinChess game = MinChess.from(FEN.START_POSITION);
+
+        game.doMove(encodeMove(Square.e2.bitPosition(), Square.e4.bitPosition()));
+
+        assertFalse(game.getTurn());
+        assertEquals(0, game.getHalfMoveClock());
+        assertEquals(1, game.getFullMoveClock());
+
+        assertEquals(FEN.from("rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq e3 0 1"), game.toFEN());
+    }
+}

src/test/java/net/chesstango/gardel/pgn/PGNTest.java

@@ -16,7 +16,7 @@
 public class PGNTest {
 
     @Test
-    public void testToEpd() throws IOException {
+    public void testToEpd(){
         PGN pgn = new PGN();
 
         pgn.setMoveList(List.of("a4"));
@@ -30,10 +30,12 @@ public void testToEpd() throws IOException {
         EPD epdFirst = epdList.getFirst();
 
         assertEquals("a4", epdFirst.getSuppliedMoveStr());
+        assertEquals("0", epdFirst.getHalfMoveClock());
+        assertEquals("1", epdFirst.getFullMoveClock());
     }
 
     @Test
-    public void test_fromFEN() throws IOException {
+    public void test_fromFEN() {
         PGN pgn = PGN.from(FEN.START_POSITION);
 
         assertNull(pgn.getFen());