Refactor based on clippy, move tt to search module and call iterative deepening from uci_go

This commit is contained in:
stefiosif
2024-11-03 01:19:12 +02:00
parent 802bdcdb37
commit 1b28de5064
11 changed files with 67 additions and 92 deletions

View File

@@ -1,40 +1,30 @@
use crate::{
board::{game::Game, transposition_table::TranspositionTable},
board::game::Game,
evaluation::{MAX_SCORE, MIN_SCORE},
movegen::r#move::Move,
};
use super::negamax;
use super::{negamax, transposition_table::TranspositionTable, MAX_TT_SIZE};
pub fn iterative_deepening(
game: &mut Game,
max_depth: u8,
move_time: u128,
mut tt: TranspositionTable,
) -> Result<Move, String> {
let mut nodes = 0;
let (mut mv, _): (Option<Move>, i32) = (None, 0);
pub fn iterative_deepening(game: &mut Game, max_depth: u8, move_time: u128) -> Option<Move> {
let mut tt = TranspositionTable::new(MAX_TT_SIZE);
let mut mv: Option<Move> = None;
let time_now = std::time::Instant::now();
for depth in 0..max_depth {
if move_time < time_now.elapsed().as_millis() {
return Ok(mv.expect("No move selected"));
for depth in 1..=max_depth {
if time_now.elapsed().as_millis() >= move_time {
return mv;
}
(mv, _) = negamax::negamax(game, MIN_SCORE, MAX_SCORE, depth, 0, &mut tt, &mut nodes);
dbg!(depth, nodes);
(mv, _) = negamax::negamax(game, MIN_SCORE, MAX_SCORE, depth, 0, &mut tt);
}
Ok(mv.expect("No move selected"))
mv
}
#[cfg(test)]
mod tests {
use crate::{
board::{fen::from_fen, transposition_table::TranspositionTable},
movegen::attack_generator::init_attacks,
search,
};
use crate::{board::fen::from_fen, movegen::attack_generator::init_attacks, search};
const FEN: &str = "1r2k2r/2P1pq1p/2npb3/1p3ppP/p3P3/P2B1Q2/1P1PNPP1/R3K2R w KQk g6 0 1";
@@ -42,10 +32,9 @@ mod tests {
fn test_iterative_deepening() -> Result<(), String> {
init_attacks();
let mut game = from_fen(FEN)?;
let tt = TranspositionTable::new(1000000);
let time_now = std::time::Instant::now();
let _ = search::iterative_deepening::iterative_deepening(&mut game, 6, 100000, tt);
let _ = search::iterative_deepening::iterative_deepening(&mut game, 6, 1000);
dbg!(time_now.elapsed());
Ok(())