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

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);