titaniumtown/othello
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean

Browse Source
This commit is contained in:
Simon Gardling
2025-02-20 12:14:23 -05:00
parent e1bae4e43b
commit 7446cf90f6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
benches/future_children.rs
View File

@@ -11,10 +11,10 @@ fn extend_layers_test(depth: usize, expire: usize) {
fn criterion_benchmark(c: &mut Criterion) { fn criterion_benchmark(c: &mut Criterion) {
const EXPIRE: usize = 4; const EXPIRE: usize = 4;
let mut group = c.benchmark_group(format!("extend_layers (expire {})", EXPIRE)); let mut group = c.benchmark_group(format!("extend_layers (expire {})", EXPIRE));
group.measurement_time(Duration::from_secs(60)); group.measurement_time(Duration::from_secs(10));
group.sample_size(10000); group.sample_size(1000);
for (depth, expire) in (2..6).zip([EXPIRE].into_iter().cycle()) { for (depth, expire) in (4..8).zip([EXPIRE].into_iter().cycle()) {
// TODO! maybe somehow get throughput from `extend_layers`? // TODO! maybe somehow get throughput from `extend_layers`?
// group.throughput(Throughput::Elements(depth as u64)); // group.throughput(Throughput::Elements(depth as u64));
group.bench_with_input(BenchmarkId::from_parameter(depth), &depth, |b, depth| { group.bench_with_input(BenchmarkId::from_parameter(depth), &depth, |b, depth| {

12
src/board.rs
View File

@@ -73,7 +73,8 @@ fn gen_adj_lookup() -> PosMap<ChainCollection> {
chains chains
.iter() .iter()
.flatten() .flatten()
.all(|(i, j)| (0..BOARD_SIZE).contains(i) && (0..BOARD_SIZE).contains(j)), .flat_map(|(i, j)| [i, j]) // flatten to just numbers
.all(|x| (0..BOARD_SIZE).contains(x)),
"chains go out-of-bounds" "chains go out-of-bounds"
); );
@@ -320,16 +321,15 @@ impl Board {
ADJ_LOOKUP ADJ_LOOKUP
.get(i, j) .get(i, j)
.iter() .iter()
.filter_map(move |chain| { .flat_map(move |chain| {
let mut end_idx = None;
for (idx, &(new_i, new_j)) in chain.into_iter().enumerate() { for (idx, &(new_i, new_j)) in chain.into_iter().enumerate() {
let piece = self.get(new_i, new_j)?; let piece = self.get(new_i, new_j)?;
if piece == starting_color { if piece == starting_color {
end_idx = Some(idx); // SAFETY! get_unchecked is fine here because it's an index of itself, it's fine
break; return Some(unsafe { chain.get_unchecked(..idx) });
} }
} }
end_idx.and_then(|idx| chain.get(..idx)) None
}) })
.flatten() .flatten()
} }