From 45224bf6c2e9b68521d527aa96de05dbf81dbd97 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 18 Feb 2025 22:53:13 -0500 Subject: [PATCH] cleanup test + ensure chain validity --- benches/future_children.rs | 8 +++----- src/board.rs | 9 +++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/benches/future_children.rs b/benches/future_children.rs index 99ae01a..f24cc8a 100644 --- a/benches/future_children.rs +++ b/benches/future_children.rs @@ -1,8 +1,6 @@ use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput}; -use std::time::Duration; - -// use crate::future_move::FutureMove; use othello::{board::Board, future_moves::FutureMoves, piece::Piece}; +use std::time::Duration; fn extend_layers_test(depth: usize, expire: usize) { let mut fut = FutureMoves::new(Piece::Black, depth, expire); @@ -15,10 +13,10 @@ fn criterion_benchmark(c: &mut Criterion) { let mut group = c.benchmark_group(format!("extend_layers (expire {})", EXPIRE)); group.measurement_time(Duration::from_secs(10)); - for (depth, expire) in (2..6).zip([EXPIRE].iter().cycle()) { + for (depth, expire) in (2..6).zip([EXPIRE].into_iter().cycle()) { group.throughput(Throughput::Elements(depth as u64)); group.bench_with_input(BenchmarkId::from_parameter(depth), &depth, |b, depth| { - b.iter(|| extend_layers_test(*depth, *expire)); + b.iter(|| extend_layers_test(*depth, expire)); }); } group.finish(); diff --git a/src/board.rs b/src/board.rs index 7d4141d..c78a554 100644 --- a/src/board.rs +++ b/src/board.rs @@ -53,6 +53,15 @@ fn gen_adj_lookup() -> PosMap { // handle diagonals chains.extend(diag_raw(i_chain, j_chain).map(Iterator::collect)); + + // make sure all chains are in the proper range so we can ignore bounds checking later + assert!( + chains.iter().all(|x| x.iter().all( + |(i, j)| (0..BOARD_SIZE).contains(i) && (0..BOARD_SIZE).contains(j) + )), + "chains go out-of-bounds" + ); + chains }) .collect()