Fix typo in IsSquareAttacked methods (#509)

lynx-chess · Nov 16, 2023 · f4afe2c · f4afe2c
1 parent 098ff30
commit f4afe2c
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 105 deletions.
diff --git a/src/Lynx.Benchmark/MoveGeneratorParallel.cs b/src/Lynx.Benchmark/MoveGeneratorParallel.cs
@@ -293,9 +293,9 @@ internal static IEnumerable<Move> GenerateCastlingMoves(Position position, int o
  if (((position.Castle & (int)CastlingRights.WK) != default)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.f1)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.g1)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.e1, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.f1, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.g1, position, oppositeSide))
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.e1, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.f1, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.g1, position, oppositeSide))
  {
  yield return MoveExtensions.Encode(sourceSquare, Constants.WhiteShortCastleKingSquare, piece, isShortCastle: TRUE);
  }
@@ -304,9 +304,9 @@ internal static IEnumerable<Move> GenerateCastlingMoves(Position position, int o
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.d1)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.c1)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.b1)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.e1, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.d1, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.c1, position, oppositeSide))
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.e1, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.d1, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.c1, position, oppositeSide))
  {
  yield return MoveExtensions.Encode(sourceSquare, Constants.WhiteLongCastleKingSquare, piece, isLongCastle: TRUE);
  }
@@ -316,9 +316,9 @@ internal static IEnumerable<Move> GenerateCastlingMoves(Position position, int o
  if (((position.Castle & (int)CastlingRights.BK) != default)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.f8)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.g8)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.e8, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.f8, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.g8, position, oppositeSide))
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.e8, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.f8, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.g8, position, oppositeSide))
  {
  yield return MoveExtensions.Encode(sourceSquare, Constants.BlackShortCastleKingSquare, piece, isShortCastle: TRUE);
  }
@@ -327,9 +327,9 @@ internal static IEnumerable<Move> GenerateCastlingMoves(Position position, int o
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.d8)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.c8)
  && !position.OccupancyBitBoards[(int)Side.Both].GetBit(BoardSquare.b8)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.e8, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.d8, position, oppositeSide)
- && !Attacks.IsSquaredAttackedBySide((int)BoardSquare.c8, position, oppositeSide))
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.e8, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.d8, position, oppositeSide)
+ && !Attacks.IsSquareAttackedBySide((int)BoardSquare.c8, position, oppositeSide))
  {
  yield return MoveExtensions.Encode(sourceSquare, Constants.BlackLongCastleKingSquare, piece, isLongCastle: TRUE);
  }

diff --git a/src/Lynx.Dev/Program.cs b/src/Lynx.Dev/Program.cs
@@ -338,7 +338,7 @@ static void _21_IsSquareAttacked()
 
  position.PrintAttackedSquares(Side.Black);
 
- Console.WriteLine(Attacks.IsSquaredAttacked((int)BoardSquare.e4, Side.Black, position.PieceBitBoards, position.OccupancyBitBoards));
+ Console.WriteLine(Attacks.IsSquareAttacked((int)BoardSquare.e4, Side.Black, position.PieceBitBoards, position.OccupancyBitBoards));
 
  Console.WriteLine("=====================================");
 

diff --git a/src/Lynx/Attacks.cs b/src/Lynx/Attacks.cs
@@ -123,11 +123,11 @@ public static BitBoard QueenAttacks(BitBoard rookAttacks, BitBoard bishopAttacks
  }
 
  [MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static bool IsSquaredAttackedBySide(int squaredIndex, Position position, Side sideToMove) =>
- IsSquaredAttacked(squaredIndex, sideToMove, position.PieceBitBoards, position.OccupancyBitBoards);
+ public static bool IsSquareAttackedBySide(int squaredIndex, Position position, Side sideToMove) =>
+ IsSquareAttacked(squaredIndex, sideToMove, position.PieceBitBoards, position.OccupancyBitBoards);
 
  [MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static bool IsSquaredAttacked(int squareIndex, Side sideToMove, BitBoard[] piecePosition, BitBoard[] occupancy)
+ public static bool IsSquareAttacked(int squareIndex, Side sideToMove, BitBoard[] piecePosition, BitBoard[] occupancy)
  {
  Utils.Assert(sideToMove != Side.Both);
 

diff --git a/src/Lynx/Model/Position.cs b/src/Lynx/Model/Position.cs
@@ -460,7 +460,7 @@ internal bool IsValid()
  var oppositeKingSquare = oppositeKingBitBoard == default ? -1 : oppositeKingBitBoard.GetLS1BIndex();
 
  return kingSquare >= 0 && oppositeKingSquare >= 0
- && !Attacks.IsSquaredAttacked(oppositeKingSquare, Side, PieceBitBoards, OccupancyBitBoards);
+ && !Attacks.IsSquareAttacked(oppositeKingSquare, Side, PieceBitBoards, OccupancyBitBoards);
  }
 
  /// <summary>
@@ -475,7 +475,7 @@ public bool WasProduceByAValidMove()
  {
  var oppositeKingSquare = PieceBitBoards[(int)Piece.k - Utils.PieceOffset(Side)].GetLS1BIndex();
 
- return !Attacks.IsSquaredAttacked(oppositeKingSquare, Side, PieceBitBoards, OccupancyBitBoards);
+ return !Attacks.IsSquareAttacked(oppositeKingSquare, Side, PieceBitBoards, OccupancyBitBoards);
  }
 
  [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -960,7 +960,7 @@ public void PrintAttackedSquares(Side sideToMove)
 
  var squareIndex = BitBoardExtensions.SquareIndex(rank, file);
 
- var pieceRepresentation = Attacks.IsSquaredAttacked(squareIndex, sideToMove, PieceBitBoards, OccupancyBitBoards)
+ var pieceRepresentation = Attacks.IsSquareAttacked(squareIndex, sideToMove, PieceBitBoards, OccupancyBitBoards)
  ? '1'
  : '.';