diff --git a/position/src/move_generator.rs b/position/src/move_generator.rs index e6884d4..c9d4b76 100644 --- a/position/src/move_generator.rs +++ b/position/src/move_generator.rs @@ -77,7 +77,8 @@ macro_rules! move_generator_declaration { self.move_sets.get(&piece.square()) } - fn bitboard(&self) -> chessfriend_bitboard::BitBoard { + #[cfg(test)] + fn _test_bitboard(&self) -> chessfriend_bitboard::BitBoard { self.move_sets.values().fold( chessfriend_bitboard::BitBoard::empty(), |partial, mv_set| partial | mv_set.bitboard(), diff --git a/position/src/move_generator/bishop.rs b/position/src/move_generator/bishop.rs index 5630246..a57b1a4 100644 --- a/position/src/move_generator/bishop.rs +++ b/position/src/move_generator/bishop.rs @@ -72,7 +72,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), BitBoard::new( 0b10000000_01000000_00100000_00010000_00001000_00000100_00000010_00000000 ) @@ -93,7 +93,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), BitBoard::new( 0b00000000_00000000_00000000_00000000_00001000_00000100_00000010_00000000 ) @@ -112,7 +112,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), BitBoard::new( 0b00000000_00000000_00000000_00000000_00000000_00000100_00000010_00000000 ) @@ -129,7 +129,7 @@ mod tests { let generator = ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); - let bitboard = generator.bitboard(); + let bitboard = generator._test_bitboard(); let expected = BitBoard::new( 0b00000001_10000010_01000100_00101000_00000000_00101000_01000100_10000010, ); diff --git a/position/src/move_generator/king.rs b/position/src/move_generator/king.rs index befd0b2..121905a 100644 --- a/position/src/move_generator/king.rs +++ b/position/src/move_generator/king.rs @@ -69,7 +69,7 @@ mod tests { let generator = KingMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), bitboard![E5, F5, F4, F3, E3, D3, D4, D5] ); @@ -95,10 +95,10 @@ mod tests { let generator = KingMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); - let generated_bitboard = generator.bitboard(); + let generated_bitboard = generator._test_bitboard(); let expected_bitboard = bitboard![A2, B2, B1]; assert_eq!( - generator.bitboard(), + generator._test_bitboard(), bitboard![A2, B2, B1], "Generated:\n{generated_bitboard}\nExpected:\n{expected_bitboard}" ); @@ -138,7 +138,7 @@ mod tests { assert!(pos.is_king_in_check()); let generator = KingMoveGenerator::new(&pos, Color::Black, BitBoard::FULL, BitBoard::FULL); - let generated_moves = generator.bitboard(); + let generated_moves = generator._test_bitboard(); let expected_moves = bitboard![F8, F7, F6, D6, D7, D8]; diff --git a/position/src/move_generator/queen.rs b/position/src/move_generator/queen.rs index 0b8a571..e0817cb 100644 --- a/position/src/move_generator/queen.rs +++ b/position/src/move_generator/queen.rs @@ -75,7 +75,7 @@ mod tests { let generator = ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); - let bitboard = generator.bitboard(); + let bitboard = generator._test_bitboard(); let expected = bitboard![ A2, C2, D2, E2, F2, G2, H2, // Rank B1, B3, B4, B5, B6, B7, B8, // File @@ -102,7 +102,7 @@ mod tests { let generator = ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); - let bitboard = generator.bitboard(); + let bitboard = generator._test_bitboard(); let expected = BitBoard::new( 0b10000001_01000001_00100001_00010001_00001001_00000101_00000011_00001110, ); @@ -127,7 +127,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), bitboard![ A2, C2, D2, E2, F2, G2, H2, // Rank B1, B3, B4, B5, B6, B7, B8, // File @@ -146,7 +146,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), bitboard![ A3, B3, C3, E3, F3, G3, H3, // Rank D1, D2, D4, D5, D6, D7, D8, // File diff --git a/position/src/move_generator/rook.rs b/position/src/move_generator/rook.rs index 8e9037a..f692da5 100644 --- a/position/src/move_generator/rook.rs +++ b/position/src/move_generator/rook.rs @@ -73,7 +73,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), bitboard![A1, A3, A4, A5, A6, A7, A8, B2, C2, D2, E2, F2, G2, H2] ); } @@ -92,7 +92,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), BitBoard::new( 0b00000001_00000001_00000001_00000001_00000001_00000001_00000001_00001110 ) @@ -111,7 +111,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), bitboard![A2, A3, A4, A5, A6, A7, A8, B1, C1, D1, E1] ); } @@ -124,7 +124,7 @@ mod tests { ClassicalMoveGenerator::new(&pos, Color::White, BitBoard::FULL, BitBoard::FULL); assert_eq!( - generator.bitboard(), + generator._test_bitboard(), bitboard![A4, B4, C4, E4, F4, G4, H4, D1, D2, D3, D5, D6, D7, D8] ); }