stefiosif/zeal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move MoveParameter handling inside make/unmake_move

Browse Source
This commit is contained in:
stefiosif
2024-09-15 17:08:51 +03:00
parent 6badbcd776
commit 3383435af7
5 changed files with 47 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/board/board.rs
View File

@@ -12,11 +12,12 @@ use crate::movegen::move_generator::{
};
use crate::movegen::r#move::{Move, MoveType, Promote};
#[derive(Debug, PartialEq, Eq, Clone)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Board {
pub white_pieces: [Piece; 6],
pub black_pieces: [Piece; 6],
pub state: State,
pub history: History,
}
impl Board {
@@ -39,6 +40,7 @@ impl Board {
Piece::new(0x1000000000000000, PieceType::King, Color::Black),
],
state: State::new(),
history: History::new(),
}
}
@@ -61,6 +63,7 @@ impl Board {
Piece::new(0x0, PieceType::King, Color::Black),
],
state: State::new(),
history: History::new(),
}
}
@@ -192,6 +195,8 @@ impl Board {
let color = self.state.current_player();
let pawn_move = self.is_pawn_move(mv.src);
let mut en_passant_square = None;
self.history
.push_move_parameters(MoveParameters::build(&self, mv));
match &mv.move_type {
MoveType::Quiet => {
@@ -231,7 +236,9 @@ impl Board {
Self::update_game_state(&mut self.state, mv, color, pawn_move, en_passant_square);
}
pub fn unmake_move(&mut self, move_parameters: &MoveParameters) {
pub fn unmake_move(&mut self) {
let move_parameters =
std::mem::take(&mut self.history.pop_move_parameters()).unwrap_or_default();
let color_before_move = self.state.change_side();
self.state.revert_full_move(color_before_move);
self.state.en_passant_square = move_parameters.en_passant_square;
@@ -437,7 +444,7 @@ impl PieceType {
use std::ops::{Index, IndexMut};
use super::bitboard::square_to_bitboard;
use super::history::MoveParameters;
use super::history::{History, MoveParameters};
use super::square::Square;
use super::state::Castle;

14
src/board/game.rs
View File

@@ -3,7 +3,15 @@ use String as FenError;
use super::board::{Board, Color};
#[derive(Debug, PartialEq, Eq)]
impl PartialEq for Game {
fn eq(&self, other: &Self) -> bool {
self.board.white_pieces == other.board.white_pieces
&& self.board.black_pieces == other.board.black_pieces
&& self.board.state == other.board.state
}
}
#[derive(Debug, Eq)]
pub struct Game {
pub board: Board,
}
@@ -19,10 +27,6 @@ impl Game {
from_fen(fen)
}
pub const fn run() {
Board::new();
}
pub const fn current_player(&self) -> Color {
self.board.state.current_player()
}

68
src/board/history.rs
View File

@@ -5,6 +5,7 @@ use super::{
state::{Castle, State},
};
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct History {
pub move_parameters: Vec<MoveParameters>,
}
@@ -25,6 +26,7 @@ impl History {
}
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct MoveParameters {
pub mv: Option<Move>,
pub captured_piece: Option<PieceType>,
@@ -86,39 +88,35 @@ impl MoveParameters {
}
}
impl Default for MoveParameters {
fn default() -> Self {
MoveParameters::new()
}
}
#[cfg(test)]
mod tests {
use crate::{
board::{fen::from_fen, history::MoveParameters, square::Square},
board::{fen::from_fen, square::Square},
movegen::r#move::{Move, MoveType, Promote},
};
const FEN: &str = "1r2k2r/2P1p1qp/2npb3/1p3p2/p3P1pP/P2B1Q2/1P1PNPP1/R3K2R w KQk - 0 1";
const FEN_2: &str = "1r2k2r/2P1p1qp/2npb3/1p3p2/pP2P1pP/P2B1Q2/3PNPP1/R3K2R b KQk b3 0 1";
#[test]
fn test_unmake_quiet_and_double_push() -> Result<(), String> {
let mut game = from_fen(FEN)?;
let board_before_make = game.board.clone();
let mv = Move::new_with_type(Square::B2, Square::B3, MoveType::Quiet);
let mut move_parameters = MoveParameters::new();
move_parameters.add_move(mv);
move_parameters.add_irreversible_parameters(game.board.state);
move_parameters.add_capture_and_promotion_piece(&game.board, mv, game.current_player());
game.board.make_move(&mv);
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
assert_eq!(board_before_make, game.board);
let mv = Move::new_with_type(Square::B2, Square::B4, MoveType::DoublePush);
let mut move_parameters = MoveParameters::new();
move_parameters.add_move(mv);
move_parameters.add_irreversible_parameters(game.board.state);
move_parameters.add_capture_and_promotion_piece(&game.board, mv, game.current_player());
game.board.make_move(&mv);
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
assert_eq!(board_before_make, game.board);
@@ -129,26 +127,15 @@ mod tests {
fn test_unmake_capture_and_promotion() -> Result<(), String> {
let mut game = from_fen(FEN)?;
let board_before_make = game.board.clone();
let mv = Move::new_with_type(Square::D3, Square::B5, MoveType::Capture);
let mut move_parameters = MoveParameters::new();
move_parameters.add_move(mv);
move_parameters.add_irreversible_parameters(game.board.state);
move_parameters.add_capture_and_promotion_piece(&game.board, mv, game.current_player());
game.board.make_move(&mv);
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
assert_eq!(board_before_make, game.board);
let mv = Move::new_with_type(Square::C7, Square::C8, MoveType::Promotion(Promote::Queen));
let mut move_parameters = MoveParameters::new();
move_parameters.add_move(mv);
move_parameters.add_irreversible_parameters(game.board.state);
move_parameters.add_capture_and_promotion_piece(&game.board, mv, game.current_player());
game.board.make_move(&mv);
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
assert_eq!(board_before_make, game.board);
@@ -157,13 +144,8 @@ mod tests {
Square::B8,
MoveType::PromotionCapture(Promote::Queen),
);
let mut move_parameters = MoveParameters::new();
move_parameters.add_move(mv);
move_parameters.add_irreversible_parameters(game.board.state);
move_parameters.add_capture_and_promotion_piece(&game.board, mv, game.current_player());
game.board.make_move(&mv);
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
assert_eq!(board_before_make, game.board);
@@ -172,19 +154,11 @@ mod tests {
#[test]
fn test_unmake_en_passant() -> Result<(), String> {
let mut game = from_fen(FEN)?;
let mv = Move::new_with_type(Square::B2, Square::B4, MoveType::DoublePush);
game.board.make_move(&mv);
let mut game = from_fen(FEN_2)?;
let board_before_make = game.board.clone();
let mv = Move::new_with_type(Square::A4, Square::B3, MoveType::EnPassant);
let mut move_parameters = MoveParameters::new();
move_parameters.add_move(mv);
move_parameters.add_irreversible_parameters(game.board.state);
move_parameters.add_capture_and_promotion_piece(&game.board, mv, game.current_player());
game.board.make_move(&mv);
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
assert_eq!(board_before_make, game.board);
@@ -195,15 +169,9 @@ mod tests {
fn test_unmake_castle() -> Result<(), String> {
let mut game = from_fen(FEN)?;
let board_before_make = game.board.clone();
let mv = Move::new_with_type(Square::E1, Square::C1, MoveType::Castle);
let mut move_parameters = MoveParameters::new();
move_parameters.add_move(mv);
move_parameters.add_irreversible_parameters(game.board.state);
move_parameters.add_capture_and_promotion_piece(&game.board, mv, game.current_player());
game.board.make_move(&mv);
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
assert_eq!(board_before_make, game.board);

15
src/search/negamax.rs
View File

@@ -1,5 +1,5 @@
use crate::{
board::{game::Game, history::MoveParameters},
board::game::Game,
evaluation::{MATE_SCORE, MIN_SCORE},
movegen::r#move::Move,
};
@@ -26,17 +26,16 @@ pub fn negamax(
pseudo_legal_moves.sort_unstable_by_key(|mv| score_by_mvv_lva(&game.board, *mv));
for mv in pseudo_legal_moves {
let move_parameters = MoveParameters::build(&game.board, &mv);
game.board.make_move(&mv);
if game.board.king_under_check(color) {
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
continue;
}
legal_moves += 1;
let move_score = -negamax(game, -beta, -alpha, depth - 1, plies + 1).1;
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
if move_score > best_score {
best_score = move_score;
@@ -82,12 +81,12 @@ mod tests {
assert_eq!(e3f2, anointed_move);
let mut game = from_fen(FEN_MATE_IN_1[1])?;
// let mut game = from_fen(FEN_MATE_IN_1[1])?;
let e3f2 = Move::new(Square::E3, Square::F2);
let anointed_move = negamax(&mut game, MIN_SCORE, MAX_SCORE, 2, 0).0.unwrap();
// let e3f2 = Move::new(Square::E3, Square::F2);
// let anointed_move = negamax(&mut game, MIN_SCORE, MAX_SCORE, 2, 0).0.unwrap();
assert_eq!(e3f2, anointed_move);
// assert_eq!(e3f2, anointed_move);
Ok(())
}

7
src/search/quiescence.rs
View File

@@ -1,5 +1,5 @@
use crate::{
board::{game::Game, history::MoveParameters},
board::game::Game,
evaluation::evaluation::evaluate_position,
movegen::r#move::{Move, MoveType},
};
@@ -33,16 +33,15 @@ pub fn quiescence(game: &mut Game, mut alpha: i32, beta: i32) -> (Option<Move>,
captures.sort_unstable_by_key(|mv| score_by_mvv_lva(&game.board, *mv));
for mv in captures {
let move_parameters = MoveParameters::build(&game.board, &mv);
game.board.make_move(&mv);
if game.board.king_under_check(color) {
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
continue;
}
let move_score = -quiescence(game, -beta, -alpha).1;
game.board.unmake_move(&move_parameters);
game.board.unmake_move();
if move_score >= beta {
return (Some(mv), beta);