eryn/chessfriend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[board] Implement a PositionBuilder; refactor piece bitboards into a PieceBitBoards struct

Browse source 
This makes Position immutable, even if declared mut. I think this will also make
it easier to build positions going forward.

Moving to a PieceBitBoards struct also required a lot of places that return owned
BitBoards to return refs. This is basically fine except for adding a few more &
here and there.

This was a huge refactoring project. All the move generators and a bunch of
BitBoard stuff needed to be updated.
This commit is contained in:
Eryn Wells 2024-01-19 18:08:41 -08:00
parent 939fac80d7
commit 24cce95a88
17 changed files with 472 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

58
board/src/position/pieces.rs
View file

@ -38,7 +38,7 @@ impl<'a> Iterator for Pieces<'a> {
}
let mut current_shape: Option<Shape> = None;
let mut next_nonempty_bitboard: Option<BitBoard> = None;
let mut next_nonempty_bitboard: Option<&BitBoard> = None;
while let Some(shape) = self.shape_iterator.next() {
let piece = Piece::new(self.color, *shape);
@ -76,15 +76,10 @@ impl<'a> Iterator for Pieces<'a> {
mod tests {
use super::*;
use crate::piece::{Color, Piece, Shape};
use crate::Position;
use crate::Square;
use crate::{Position, PositionBuilder};
use std::collections::HashSet;
fn place_piece_in_position(pos: &mut Position, piece: Piece, sq: Square) {
pos.place_piece(piece, sq)
.expect("Unable to place {piece:?} queen on {sq}");
}
#[test]
fn empty() {
let pos = Position::empty();
@ -94,40 +89,45 @@ mod tests {
#[test]
fn one() {
let sq = Square::E4;
let mut pos = Position::empty();
place_piece_in_position(&mut pos, Piece::new(Color::White, Shape::Queen), Square::E4);
println!("{:?}", &pos);
let pos = PositionBuilder::new()
.place_piece(piece!(White Queen on E4))
.build();
println!("{:#?}", &pos);
let mut pieces = pos.pieces(Color::White);
assert_eq!(
pieces.next(),
Some(PlacedPiece::new(Piece::new(Color::White, Shape::Queen), sq))
);
assert_eq!(pieces.next(), Some(piece!(White Queen on E4)));
assert_eq!(pieces.next(), Some(piece!(White King on E1)));
assert_eq!(pieces.next(), None);
}
#[test]
fn multiple_pieces() {
let mut pos = Position::empty();
place_piece_in_position(&mut pos, Piece::new(Color::White, Shape::Queen), Square::E4);
place_piece_in_position(&mut pos, Piece::new(Color::White, Shape::King), Square::E1);
place_piece_in_position(&mut pos, Piece::new(Color::White, Shape::Pawn), Square::B2);
place_piece_in_position(&mut pos, Piece::new(Color::White, Shape::Pawn), Square::C2);
println!("{:?}", &pos);
let pos = PositionBuilder::new()
.place_piece(piece!(White Queen on E4))
.place_piece(piece!(White King on A1))
.place_piece(piece!(White Pawn on B2))
.place_piece(piece!(White Pawn on C2))
.build();
println!("{}", crate::position::DiagramFormatter::new(&pos));
let expected_placed_pieces = HashSet::from([
PlacedPiece::new(Piece::new(Color::White, Shape::Queen), Square::E4),
PlacedPiece::new(Piece::new(Color::White, Shape::King), Square::E1),
PlacedPiece::new(Piece::new(Color::White, Shape::Pawn), Square::B2),
PlacedPiece::new(Piece::new(Color::White, Shape::Pawn), Square::C2),
piece!(White Queen on E4),
piece!(White King on A1),
piece!(White Pawn on B2),
piece!(White Pawn on C2),
]);
let placed_pieces = HashSet::from_iter(pos.pieces(Color::White));
assert_eq!(placed_pieces, expected_placed_pieces);
assert_eq!(
placed_pieces,
expected_placed_pieces,
"{:#?}",
placed_pieces
.symmetric_difference(&expected_placed_pieces)
.into_iter()
.map(|pp| format!("{}", pp))
.collect::<Vec<String>>()
);
}
}