From dbbf2d4c46cf2abaee1cfaec5e514eb2ea00f4e5 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sun, 21 Jan 2024 15:10:04 -0800
Subject: [PATCH] [board] Implement ply and full move counters on Position

Pipe these numbers through the Builders
---
 board/src/position/builders/move_builder.rs   | 23 ++++++++++++++++++-
 .../src/position/builders/position_builder.rs | 23 ++++++++++++++++++-
 board/src/position/position.rs                | 19 +++++++++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/board/src/position/builders/move_builder.rs b/board/src/position/builders/move_builder.rs
index e0d2765..d27e373 100644
--- a/board/src/position/builders/move_builder.rs
+++ b/board/src/position/builders/move_builder.rs
@@ -28,6 +28,7 @@ pub enum ValidatedMove {
         promotion: Option<Shape>,
         flags: Flags,
         en_passant_square: Option<Square>,
+        increment_ply: bool,
     },
     Castle {
         castle: Castle,
@@ -140,6 +141,7 @@ where
                     promotion: mv.promotion(),
                     flags,
                     en_passant_square,
+                    increment_ply: !(mv.is_capture() || piece.is_pawn()),
                 },
             })
         }
@@ -150,6 +152,9 @@ impl<'p> Builder<'p, ValidatedMove> {
     pub fn build(&self) -> Position {
         let player = self.position.player_to_move();
 
+        let updated_move_number =
+            self.position.move_number() + if player == Color::Black { 1 } else { 0 };
+
         match self.move_to_make {
             ValidatedMove::RegularMove {
                 from_square,
@@ -159,6 +164,7 @@ impl<'p> Builder<'p, ValidatedMove> {
                 promotion,
                 flags,
                 en_passant_square,
+                increment_ply,
             } => {
                 let mut pieces = self.position.piece_bitboards().clone();
 
@@ -174,11 +180,19 @@ impl<'p> Builder<'p, ValidatedMove> {
                     pieces.move_piece(moving_piece.piece(), from_square, to_square);
                 }
 
+                let ply = if increment_ply {
+                    self.position.ply_counter() + 1
+                } else {
+                    0
+                };
+
                 Position::new(
                     self.position.player_to_move().other(),
                     flags,
                     pieces,
                     en_passant_square,
+                    ply,
+                    updated_move_number,
                 )
             }
             ValidatedMove::Castle {
@@ -202,7 +216,14 @@ impl<'p> Builder<'p, ValidatedMove> {
                 *pieces.bitboard_for_color_mut(player) &=
                     !(king_from | rook_from) | (king_to | rook_to);
 
-                Position::new(player.other(), flags, pieces, None)
+                Position::new(
+                    player.other(),
+                    flags,
+                    pieces,
+                    None,
+                    self.position.ply_counter() + 1,
+                    updated_move_number,
+                )
             }
         }
     }
diff --git a/board/src/position/builders/position_builder.rs b/board/src/position/builders/position_builder.rs
index c99625b..1d8c3fb 100644
--- a/board/src/position/builders/position_builder.rs
+++ b/board/src/position/builders/position_builder.rs
@@ -16,6 +16,8 @@ pub struct Builder {
     flags: Flags,
     pieces: BTreeMap<Square, Piece>,
     kings: [Square; 2],
+    ply_counter: u16,
+    move_number: u16,
 }
 
 impl Builder {
@@ -28,6 +30,16 @@ impl Builder {
         self
     }
 
+    pub fn ply_counter(&mut self, num: u16) -> &mut Self {
+        self.ply_counter = num;
+        self
+    }
+
+    pub fn move_number(&mut self, num: u16) -> &mut Self {
+        self.move_number = num;
+        self
+    }
+
     pub fn place_piece(&mut self, piece: PlacedPiece) -> &mut Self {
         let square = piece.square();
 
@@ -50,7 +62,14 @@ impl Builder {
                 .filter(Self::is_piece_placement_valid),
         );
 
-        Position::new(self.player_to_move, self.flags, pieces, None)
+        Position::new(
+            self.player_to_move,
+            self.flags,
+            pieces,
+            None,
+            self.ply_counter,
+            self.move_number,
+        )
     }
 }
 
@@ -82,6 +101,8 @@ impl Default for Builder {
             flags: Flags::default(),
             pieces: pieces,
             kings: [white_king_square, black_king_square],
+            ply_counter: 0,
+            move_number: 1,
         }
     }
 }
diff --git a/board/src/position/position.rs b/board/src/position/position.rs
index 48c124f..abdfbe1 100644
--- a/board/src/position/position.rs
+++ b/board/src/position/position.rs
@@ -18,6 +18,9 @@ pub struct Position {
     pieces: PieceBitBoards,
     en_passant_square: Option<Square>,
     sight: [OnceCell<BitBoard>; 2],
+
+    half_move_counter: u16,
+    full_move_number: u16,
 }
 
 impl Position {
@@ -28,6 +31,8 @@ impl Position {
             pieces: PieceBitBoards::default(),
             en_passant_square: None,
             sight: [OnceCell::new(), OnceCell::new()],
+            half_move_counter: 0,
+            full_move_number: 1,
         }
     }
 
@@ -57,6 +62,8 @@ impl Position {
             pieces: PieceBitBoards::new([white_pieces, black_pieces]),
             en_passant_square: None,
             sight: [OnceCell::new(), OnceCell::new()],
+            half_move_counter: 0,
+            full_move_number: 1,
         }
     }
 
@@ -64,6 +71,14 @@ impl Position {
         self.color_to_move
     }
 
+    pub fn move_number(&self) -> u16 {
+        self.full_move_number
+    }
+
+    pub fn ply_counter(&self) -> u16 {
+        self.half_move_counter
+    }
+
     /// Returns true if the player has the right to castle on the given side of
     /// the board.
     ///
@@ -191,6 +206,8 @@ impl Position {
         flags: Flags,
         pieces: PieceBitBoards,
         en_passant_square: Option<Square>,
+        half_move_counter: u16,
+        full_move_number: u16,
     ) -> Self {
         Self {
             color_to_move: player_to_move,
@@ -198,6 +215,8 @@ impl Position {
             en_passant_square,
             pieces,
             sight: [OnceCell::new(), OnceCell::new()],
+            half_move_counter: 0,
+            full_move_number: 1,
         }
     }