diff --git a/src/board.rs b/src/board.rs index 7944e6317..9938da079 100644 --- a/src/board.rs +++ b/src/board.rs @@ -202,13 +202,13 @@ impl Board { pub fn add_piece(&mut self, piece: Piece, square: Square) { self.mailbox[square] = piece; - self.colors[piece.piece_color()].set(square); + self.colors[piece.color()].set(square); self.pieces[piece.piece_type()].set(square); } pub fn remove_piece(&mut self, piece: Piece, square: Square) { self.mailbox[square] = Piece::None; - self.colors[piece.piece_color()].clear(square); + self.colors[piece.color()].clear(square); self.pieces[piece.piece_type()].clear(square); } @@ -220,7 +220,7 @@ impl Board { if piece.piece_type() == PieceType::Pawn { self.state.pawn_key ^= key; } else { - self.state.non_pawn_keys[piece.piece_color()] ^= key; + self.state.non_pawn_keys[piece.color()] ^= key; } } @@ -487,7 +487,7 @@ impl Board { for piece in 0..Piece::NUM { let piece = Piece::from_index(piece); - for square in self.colored_pieces(piece.piece_color(), piece.piece_type()) { + for square in self.colored_pieces(piece.color(), piece.piece_type()) { self.update_hash(piece, square); } } diff --git a/src/lookup.rs b/src/lookup.rs index 145669805..40d667795 100644 --- a/src/lookup.rs +++ b/src/lookup.rs @@ -134,7 +134,7 @@ pub fn relative_anti_diagonal(color: Color, sq: Square) -> Bitboard { pub fn attacks(piece: Piece, square: Square, occupancies: Bitboard) -> Bitboard { match piece.piece_type() { - PieceType::Pawn => pawn_attacks(square, piece.piece_color()), + PieceType::Pawn => pawn_attacks(square, piece.color()), PieceType::Knight => knight_attacks(square), PieceType::Bishop => bishop_attacks(square, occupancies), PieceType::Rook => rook_attacks(square, occupancies), diff --git a/src/nnue.rs b/src/nnue.rs index 5c3d125ec..293063799 100644 --- a/src/nnue.rs +++ b/src/nnue.rs @@ -182,11 +182,11 @@ impl Network { let delta = &self.pst_stack[i].delta; - let from = delta.mv.from().relative_to(delta.piece.piece_color()); - let to = delta.mv.to().relative_to(delta.piece.piece_color()); + let from = delta.mv.from().relative_to(delta.piece.color()); + let to = delta.mv.to().relative_to(delta.piece.color()); if delta.piece.piece_type() == PieceType::King - && delta.piece.piece_color() == pov + && delta.piece.color() == pov && (from.is_kingside() != to.is_kingside() || INPUT_BUCKETS_LAYOUT[from] != INPUT_BUCKETS_LAYOUT[to]) { return None; @@ -208,7 +208,7 @@ impl Network { let to = delta.mv.to(); if delta.piece.piece_type() == PieceType::King - && delta.piece.piece_color() == pov + && delta.piece.color() == pov && from.is_kingside() != to.is_kingside() { return None; diff --git a/src/nnue/accumulator/psq.rs b/src/nnue/accumulator/psq.rs index 9250e4690..4617ffc08 100644 --- a/src/nnue/accumulator/psq.rs +++ b/src/nnue/accumulator/psq.rs @@ -107,20 +107,20 @@ impl PstAccumulator { let resulting_piece = if mv.is_promotion() { mv.promo_piece_type() } else { piece.piece_type() }; - let add1 = pst_index(piece.piece_color(), resulting_piece, mv.to(), king, pov); - let sub1 = pst_index(piece.piece_color(), piece.piece_type(), mv.from(), king, pov); + let add1 = pst_index(piece.color(), resulting_piece, mv.to(), king, pov); + let sub1 = pst_index(piece.color(), piece.piece_type(), mv.from(), king, pov); match mv.kind() { MoveKind::Castling => { let (rook_from, rook_to) = board.get_castling_rook(mv.to()); - let add2 = pst_index(piece.piece_color(), PieceType::Rook, rook_to, king, pov); - let sub2 = pst_index(piece.piece_color(), PieceType::Rook, rook_from, king, pov); + let add2 = pst_index(piece.color(), PieceType::Rook, rook_to, king, pov); + let sub2 = pst_index(piece.color(), PieceType::Rook, rook_from, king, pov); self.add2_sub2(prev, add1, add2, sub1, sub2, pov); } MoveKind::EnPassant => { - let sub2 = pst_index(!piece.piece_color(), PieceType::Pawn, mv.to() ^ 8, king, pov); + let sub2 = pst_index(!piece.color(), PieceType::Pawn, mv.to() ^ 8, king, pov); self.add1_sub2(prev, add1, sub1, sub2, pov); } MoveKind::Capture @@ -128,7 +128,7 @@ impl PstAccumulator { | MoveKind::PromotionCaptureB | MoveKind::PromotionCaptureR | MoveKind::PromotionCaptureQ => { - let sub2 = pst_index(!piece.piece_color(), captured.piece_type(), mv.to(), king, pov); + let sub2 = pst_index(!piece.color(), captured.piece_type(), mv.to(), king, pov); self.add1_sub2(prev, add1, sub1, sub2, pov); } _ => self.add1_sub1(prev, add1, sub1, pov), diff --git a/src/nnue/accumulator/threats/threat_index.rs b/src/nnue/accumulator/threats/threat_index.rs index b161eeba1..913d6d839 100644 --- a/src/nnue/accumulator/threats/threat_index.rs +++ b/src/nnue/accumulator/threats/threat_index.rs @@ -72,10 +72,10 @@ pub fn initialize() { for attacking in Piece::ALL { for attacked in Piece::ALL { let attacking_piece = attacking.piece_type(); - let attacking_color = attacking.piece_color(); + let attacking_color = attacking.color(); let attacked_piece = attacked.piece_type(); - let attacked_color = attacked.piece_color(); + let attacked_color = attacked.color(); let map = PIECE_INTERACTION_MAP[attacking_piece][attacked_piece]; let base = offset_table[attacking] diff --git a/src/types/piece.rs b/src/types/piece.rs index eeedeeaa2..6861f71ef 100644 --- a/src/types/piece.rs +++ b/src/types/piece.rs @@ -56,7 +56,7 @@ impl Piece { unsafe { std::mem::transmute(index as u8) } } - pub const fn piece_color(self) -> Color { + pub const fn color(self) -> Color { unsafe { std::mem::transmute((self as u8) & 1) } }