max/battlesnake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

evaluate stop condition at every simulation step

Browse Source
This commit is contained in:
Max Känner 2024-10-06 21:55:15 +02:00
parent d8452daddf
commit 6cb0fe1550
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
battlesnake/src/logic.rs
View File

@ -217,11 +217,16 @@ impl Node {
board: &mut simulation::Board, board: &mut simulation::Board,
deadline: &Instant, deadline: &Instant,
) -> Result<Option<SnakeToken>, DeadlineError> { ) -> Result<Option<SnakeToken>, DeadlineError> {
let winner = if self.statistic.played == 0 { let stop_condition =
|board: &simulation::Board| board.alive_snakes() <= 1 || Instant::now() >= *deadline;
let winner = if stop_condition(board) {
if Instant::now() >= *deadline {
return Err(DeadlineError);
}
board.snakes().next()
} else if self.statistic.played == 0 {
// We didn't simulate a game for this node yet. Do that // We didn't simulate a game for this node yet. Do that
board.simulate_until(&mut thread_rng(), |board| { board.simulate_until(&mut thread_rng(), stop_condition);
board.alive_snakes() <= 1 || Instant::now() >= *deadline
});
if Instant::now() >= *deadline { if Instant::now() >= *deadline {
return Err(DeadlineError); return Err(DeadlineError);
} }
@ -252,9 +257,6 @@ impl Node {
}) })
.collect(); .collect();
if Instant::now() >= *deadline {
return Err(DeadlineError);
}
board.simulate_actions(&actions, &mut thread_rng()); board.simulate_actions(&actions, &mut thread_rng());
let winner = self let winner = self
.childs .childs