X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.cpp;h=66890a5f5e2224473d81f4a20d6ab3b8b0937814;hb=939b621e5c67e9ef89b409fd773d38058341906c;hp=1350ddf97a5923e33c3f677bdef398df79154ea3;hpb=b1ac6c69a077c95c122a82d5b757adf9470fb308;p=stockfish
diff --git a/src/position.cpp b/src/position.cpp
index 1350ddf9..66890a5f 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,71 +17,101 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
#include
#include
#include
+#include
+#include
#include "bitcount.h"
-#include "mersenne.h"
#include "movegen.h"
-#include "movepick.h"
#include "position.h"
#include "psqtab.h"
-#include "san.h"
+#include "rkiss.h"
+#include "thread.h"
#include "tt.h"
-#include "ucioption.h"
using std::string;
-
-
-////
-//// Variables
-////
-
-int Position::castleRightsMask[64];
+using std::cout;
+using std::endl;
Key Position::zobrist[2][8][64];
Key Position::zobEp[64];
Key Position::zobCastle[16];
-Key Position::zobMaterial[2][8][16];
Key Position::zobSideToMove;
Key Position::zobExclusion;
-Score Position::PieceSquareTable[16][64];
+Score Position::pieceSquareTable[16][64];
+
+// Material values arrays, indexed by Piece
+const Value PieceValueMidgame[17] = {
+ VALUE_ZERO,
+ PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
+ RookValueMidgame, QueenValueMidgame,
+ VALUE_ZERO, VALUE_ZERO, VALUE_ZERO,
+ PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
+ RookValueMidgame, QueenValueMidgame
+};
-static bool RequestPending = false;
+const Value PieceValueEndgame[17] = {
+ VALUE_ZERO,
+ PawnValueEndgame, KnightValueEndgame, BishopValueEndgame,
+ RookValueEndgame, QueenValueEndgame,
+ VALUE_ZERO, VALUE_ZERO, VALUE_ZERO,
+ PawnValueEndgame, KnightValueEndgame, BishopValueEndgame,
+ RookValueEndgame, QueenValueEndgame
+};
-/// Constructors
+namespace {
+
+ // Bonus for having the side to move (modified by Joona Kiiski)
+ const Score TempoValue = make_score(48, 22);
+
+ // To convert a Piece to and from a FEN char
+ const string PieceToChar(".PNBRQK pnbrqk ");
+}
+
+
+/// CheckInfo c'tor
CheckInfo::CheckInfo(const Position& pos) {
- Color us = pos.side_to_move();
- Color them = opposite_color(us);
+ Color them = flip(pos.side_to_move());
+ Square ksq = pos.king_square(them);
- ksq = pos.king_square(them);
- dcCandidates = pos.discovered_check_candidates(us);
+ pinned = pos.pinned_pieces();
+ dcCandidates = pos.discovered_check_candidates();
- checkSq[PAWN] = pos.attacks_from(ksq, them);
+ checkSq[PAWN] = pos.attacks_from(ksq, them);
checkSq[KNIGHT] = pos.attacks_from(ksq);
checkSq[BISHOP] = pos.attacks_from(ksq);
- checkSq[ROOK] = pos.attacks_from(ksq);
- checkSq[QUEEN] = checkSq[BISHOP] | checkSq[ROOK];
- checkSq[KING] = EmptyBoardBB;
+ checkSq[ROOK] = pos.attacks_from(ksq);
+ checkSq[QUEEN] = checkSq[BISHOP] | checkSq[ROOK];
+ checkSq[KING] = 0;
}
-Position::Position(const Position& pos) {
- copy(pos);
+
+/// Position c'tors. Here we always create a copy of the original position
+/// or the FEN string, we want the new born Position object do not depend
+/// on any external data so we detach state pointer from the source one.
+
+void Position::copy(const Position& pos, int th) {
+
+ memcpy(this, &pos, sizeof(Position));
+ startState = *st;
+ st = &startState;
+ threadID = th;
+ nodes = 0;
+
+ assert(pos_is_ok());
}
-Position::Position(const string& fen) {
- from_fen(fen);
+Position::Position(const string& fen, bool isChess960, int th) {
+
+ from_fen(fen, isChess960);
+ threadID = th;
}
@@ -89,144 +119,114 @@ Position::Position(const string& fen) {
/// string. This function is not very robust - make sure that input FENs are
/// correct (this is assumed to be the responsibility of the GUI).
-void Position::from_fen(const string& fen) {
+void Position::from_fen(const string& fenStr, bool isChess960) {
+/*
+ A FEN string defines a particular position using only the ASCII character set.
+
+ A FEN string contains six fields separated by a space. The fields are:
+
+ 1) Piece placement (from white's perspective). Each rank is described, starting
+ with rank 8 and ending with rank 1; within each rank, the contents of each
+ square are described from file A through file H. Following the Standard
+ Algebraic Notation (SAN), each piece is identified by a single letter taken
+ from the standard English names. White pieces are designated using upper-case
+ letters ("PNBRQK") while Black take lowercase ("pnbrqk"). Blank squares are
+ noted using digits 1 through 8 (the number of blank squares), and "/"
+ separates ranks.
- static const string pieceLetters = "KQRBNPkqrbnp";
- static const Piece pieces[] = { WK, WQ, WR, WB, WN, WP, BK, BQ, BR, BB, BN, BP };
+ 2) Active color. "w" means white moves next, "b" means black.
+
+ 3) Castling availability. If neither side can castle, this is "-". Otherwise,
+ this has one or more letters: "K" (White can castle kingside), "Q" (White
+ can castle queenside), "k" (Black can castle kingside), and/or "q" (Black
+ can castle queenside).
+
+ 4) En passant target square (in algebraic notation). If there's no en passant
+ target square, this is "-". If a pawn has just made a 2-square move, this
+ is the position "behind" the pawn. This is recorded regardless of whether
+ there is a pawn in position to make an en passant capture.
+
+ 5) Halfmove clock. This is the number of halfmoves since the last pawn advance
+ or capture. This is used to determine if a draw can be claimed under the
+ fifty-move rule.
+
+ 6) Fullmove number. The number of the full move. It starts at 1, and is
+ incremented after Black's move.
+*/
+
+ char col, row, token;
+ size_t p;
+ Square sq = SQ_A8;
+ std::istringstream fen(fenStr);
clear();
+ fen >> std::noskipws;
- // Board
- Rank rank = RANK_8;
- File file = FILE_A;
- size_t i = 0;
- for ( ; fen[i] != ' '; i++)
+ // 1. Piece placement
+ while ((fen >> token) && !isspace(token))
{
- if (isdigit(fen[i]))
- {
- // Skip the given number of files
- file += (fen[i] - '1' + 1);
- continue;
- }
- else if (fen[i] == '/')
- {
- file = FILE_A;
- rank--;
- continue;
- }
- size_t idx = pieceLetters.find(fen[i]);
- if (idx == string::npos)
+ if (token == '/')
+ sq -= Square(16); // Jump back of 2 rows
+
+ else if (isdigit(token))
+ sq += Square(token - '0'); // Skip the given number of files
+
+ else if ((p = PieceToChar.find(token)) != string::npos)
{
- std::cout << "Error in FEN at character " << i << std::endl;
- return;
+ put_piece(Piece(p), sq);
+ sq++;
}
- Square square = make_square(file, rank);
- put_piece(pieces[idx], square);
- file++;
}
- // Side to move
- i++;
- if (fen[i] != 'w' && fen[i] != 'b')
+ // 2. Active color
+ fen >> token;
+ sideToMove = (token == 'w' ? WHITE : BLACK);
+ fen >> token;
+
+ // 3. Castling availability. Compatible with 3 standards: Normal FEN standard,
+ // Shredder-FEN that uses the letters of the columns on which the rooks began
+ // the game instead of KQkq and also X-FEN standard that, in case of Chess960,
+ // if an inner rook is associated with the castling right, the castling tag is
+ // replaced by the file letter of the involved rook, as for the Shredder-FEN.
+ while ((fen >> token) && !isspace(token))
{
- std::cout << "Error in FEN at character " << i << std::endl;
- return;
- }
- sideToMove = (fen[i] == 'w' ? WHITE : BLACK);
+ Square rsq;
+ Color c = islower(token) ? BLACK : WHITE;
+ Piece rook = make_piece(c, ROOK);
- // Castling rights
- i++;
- if (fen[i] != ' ')
- {
- std::cout << "Error in FEN at character " << i << std::endl;
- return;
- }
+ token = char(toupper(token));
- i++;
- while (strchr("KQkqabcdefghABCDEFGH-", fen[i])) {
- if (fen[i] == '-')
- {
- i++;
- break;
- }
- else if (fen[i] == 'K') allow_oo(WHITE);
- else if (fen[i] == 'Q') allow_ooo(WHITE);
- else if (fen[i] == 'k') allow_oo(BLACK);
- else if (fen[i] == 'q') allow_ooo(BLACK);
- else if (fen[i] >= 'A' && fen[i] <= 'H') {
- File rookFile, kingFile = FILE_NONE;
- for (Square square = SQ_B1; square <= SQ_G1; square++)
- if (piece_on(square) == WK)
- kingFile = square_file(square);
- if (kingFile == FILE_NONE) {
- std::cout << "Error in FEN at character " << i << std::endl;
- return;
- }
- initialKFile = kingFile;
- rookFile = File(fen[i] - 'A') + FILE_A;
- if (rookFile < initialKFile) {
- allow_ooo(WHITE);
- initialQRFile = rookFile;
- }
- else {
- allow_oo(WHITE);
- initialKRFile = rookFile;
- }
- }
- else if (fen[i] >= 'a' && fen[i] <= 'h') {
- File rookFile, kingFile = FILE_NONE;
- for (Square square = SQ_B8; square <= SQ_G8; square++)
- if (piece_on(square) == BK)
- kingFile = square_file(square);
- if (kingFile == FILE_NONE) {
- std::cout << "Error in FEN at character " << i << std::endl;
- return;
- }
- initialKFile = kingFile;
- rookFile = File(fen[i] - 'a') + FILE_A;
- if (rookFile < initialKFile) {
- allow_ooo(BLACK);
- initialQRFile = rookFile;
- }
- else {
- allow_oo(BLACK);
- initialKRFile = rookFile;
- }
- }
- else {
- std::cout << "Error in FEN at character " << i << std::endl;
- return;
- }
- i++;
- }
+ if (token == 'K')
+ for (rsq = relative_square(c, SQ_H1); piece_on(rsq) != rook; rsq--) {}
- // Skip blanks
- while (fen[i] == ' ')
- i++;
+ else if (token == 'Q')
+ for (rsq = relative_square(c, SQ_A1); piece_on(rsq) != rook; rsq++) {}
- // En passant square -- ignore if no capture is possible
- if ( i <= fen.length() - 2
- && (fen[i] >= 'a' && fen[i] <= 'h')
- && (fen[i+1] == '3' || fen[i+1] == '6'))
- {
- Square fenEpSquare = square_from_string(fen.substr(i, 2));
- Color them = opposite_color(sideToMove);
- if (attacks_from(fenEpSquare, them) & this->pieces(PAWN, sideToMove))
- st->epSquare = square_from_string(fen.substr(i, 2));
+ else if (token >= 'A' && token <= 'H')
+ rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1));
+
+ else
+ continue;
+
+ set_castle_right(king_square(c), rsq);
}
- // Various initialisation
- for (Square sq = SQ_A1; sq <= SQ_H8; sq++)
- castleRightsMask[sq] = ALL_CASTLES;
+ // 4. En passant square. Ignore if no pawn capture is possible
+ if ( ((fen >> col) && (col >= 'a' && col <= 'h'))
+ && ((fen >> row) && (row == '3' || row == '6')))
+ {
+ st->epSquare = make_square(File(col - 'a'), Rank(row - '1'));
- castleRightsMask[make_square(initialKFile, RANK_1)] ^= (WHITE_OO|WHITE_OOO);
- castleRightsMask[make_square(initialKFile, RANK_8)] ^= (BLACK_OO|BLACK_OOO);
- castleRightsMask[make_square(initialKRFile, RANK_1)] ^= WHITE_OO;
- castleRightsMask[make_square(initialKRFile, RANK_8)] ^= BLACK_OO;
- castleRightsMask[make_square(initialQRFile, RANK_1)] ^= WHITE_OOO;
- castleRightsMask[make_square(initialQRFile, RANK_8)] ^= BLACK_OOO;
+ if (!(attackers_to(st->epSquare) & pieces(PAWN, sideToMove)))
+ st->epSquare = SQ_NONE;
+ }
+
+ // 5-6. Halfmove clock and fullmove number
+ fen >> std::skipws >> st->rule50 >> startPosPly;
- find_checkers();
+ // Convert from fullmove starting from 1 to ply starting from 0,
+ // handle also common incorrect FEN with fullmove = 0.
+ startPosPly = std::max(2 * (startPosPly - 1), 0) + int(sideToMove == BLACK);
st->key = compute_key();
st->pawnKey = compute_pawn_key();
@@ -234,215 +234,180 @@ void Position::from_fen(const string& fen) {
st->value = compute_value();
st->npMaterial[WHITE] = compute_non_pawn_material(WHITE);
st->npMaterial[BLACK] = compute_non_pawn_material(BLACK);
+ st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(flip(sideToMove));
+ chess960 = isChess960;
+
+ assert(pos_is_ok());
}
-/// Position::to_fen() converts the position object to a FEN string. This is
-/// probably only useful for debugging.
+/// Position::set_castle_right() is an helper function used to set castling
+/// rights given the corresponding king and rook starting squares.
+
+void Position::set_castle_right(Square ksq, Square rsq) {
+
+ int f = (rsq < ksq ? WHITE_OOO : WHITE_OO) << color_of(piece_on(ksq));
+
+ st->castleRights |= f;
+ castleRightsMask[ksq] ^= f;
+ castleRightsMask[rsq] ^= f;
+ castleRookSquare[f] = rsq;
+}
+
+
+/// Position::to_fen() returns a FEN representation of the position. In case
+/// of Chess960 the Shredder-FEN notation is used. Mainly a debugging function.
const string Position::to_fen() const {
- static const string pieceLetters = " PNBRQK pnbrqk";
- string fen;
- int skip;
+ std::ostringstream fen;
+ Square sq;
+ int emptyCnt;
for (Rank rank = RANK_8; rank >= RANK_1; rank--)
{
- skip = 0;
+ emptyCnt = 0;
+
for (File file = FILE_A; file <= FILE_H; file++)
{
- Square sq = make_square(file, rank);
- if (!square_is_occupied(sq))
- { skip++;
- continue;
- }
- if (skip > 0)
+ sq = make_square(file, rank);
+
+ if (square_is_empty(sq))
+ emptyCnt++;
+ else
{
- fen += (char)skip + '0';
- skip = 0;
+ if (emptyCnt > 0)
+ {
+ fen << emptyCnt;
+ emptyCnt = 0;
+ }
+ fen << PieceToChar[piece_on(sq)];
}
- fen += pieceLetters[piece_on(sq)];
}
- if (skip > 0)
- fen += (char)skip + '0';
- fen += (rank > RANK_1 ? '/' : ' ');
+ if (emptyCnt > 0)
+ fen << emptyCnt;
+
+ if (rank > RANK_1)
+ fen << '/';
}
- fen += (sideToMove == WHITE ? "w " : "b ");
- if (st->castleRights != NO_CASTLES)
- {
- if (initialKFile == FILE_E && initialQRFile == FILE_A && initialKRFile == FILE_H)
- {
- if (can_castle_kingside(WHITE)) fen += 'K';
- if (can_castle_queenside(WHITE)) fen += 'Q';
- if (can_castle_kingside(BLACK)) fen += 'k';
- if (can_castle_queenside(BLACK)) fen += 'q';
- }
- else
- {
- if (can_castle_kingside(WHITE))
- fen += char(toupper(file_to_char(initialKRFile)));
- if (can_castle_queenside(WHITE))
- fen += char(toupper(file_to_char(initialQRFile)));
- if (can_castle_kingside(BLACK))
- fen += file_to_char(initialKRFile);
- if (can_castle_queenside(BLACK))
- fen += file_to_char(initialQRFile);
- }
- } else
- fen += '-';
-
- fen += ' ';
- if (ep_square() != SQ_NONE)
- fen += square_to_string(ep_square());
- else
- fen += '-';
- return fen;
-}
+ fen << (sideToMove == WHITE ? " w " : " b ");
+ if (can_castle(WHITE_OO))
+ fen << (chess960 ? char(toupper(file_to_char(file_of(castle_rook_square(WHITE_OO))))) : 'K');
-/// Position::print() prints an ASCII representation of the position to
-/// the standard output. If a move is given then also the san is print.
+ if (can_castle(WHITE_OOO))
+ fen << (chess960 ? char(toupper(file_to_char(file_of(castle_rook_square(WHITE_OOO))))) : 'Q');
-void Position::print(Move m) const {
+ if (can_castle(BLACK_OO))
+ fen << (chess960 ? file_to_char(file_of(castle_rook_square(BLACK_OO))) : 'k');
- static const string pieceLetters = " PNBRQK PNBRQK .";
+ if (can_castle(BLACK_OOO))
+ fen << (chess960 ? file_to_char(file_of(castle_rook_square(BLACK_OOO))) : 'q');
- // Check for reentrancy, as example when called from inside
- // MovePicker that is used also here in move_to_san()
- if (RequestPending)
- return;
+ if (st->castleRights == CASTLES_NONE)
+ fen << '-';
+
+ fen << (ep_square() == SQ_NONE ? " - " : " " + square_to_string(ep_square()) + " ")
+ << st->rule50 << " " << 1 + (startPosPly - int(sideToMove == BLACK)) / 2;
+
+ return fen.str();
+}
+
+
+/// Position::print() prints an ASCII representation of the position to
+/// the standard output. If a move is given then also the san is printed.
+
+void Position::print(Move move) const {
- RequestPending = true;
+ const char* dottedLine = "\n+---+---+---+---+---+---+---+---+\n";
- std::cout << std::endl;
- if (m != MOVE_NONE)
+ if (move)
{
- string col = (color_of_piece_on(move_from(m)) == BLACK ? ".." : "");
- std::cout << "Move is: " << col << move_to_san(*this, m) << std::endl;
+ Position p(*this, thread());
+ cout << "\nMove is: " << (sideToMove == BLACK ? ".." : "") << move_to_san(p, move);
}
+
for (Rank rank = RANK_8; rank >= RANK_1; rank--)
{
- std::cout << "+---+---+---+---+---+---+---+---+" << std::endl;
+ cout << dottedLine << '|';
for (File file = FILE_A; file <= FILE_H; file++)
{
Square sq = make_square(file, rank);
Piece piece = piece_on(sq);
- if (piece == EMPTY && square_color(sq) == WHITE)
- piece = NO_PIECE;
+ char c = (color_of(piece) == BLACK ? '=' : ' ');
+
+ if (piece == PIECE_NONE && color_of(sq) == DARK)
+ piece = PIECE_NONE_DARK_SQ;
- char col = (color_of_piece_on(sq) == BLACK ? '=' : ' ');
- std::cout << '|' << col << pieceLetters[piece] << col;
+ cout << c << PieceToChar[piece] << c << '|';
}
- std::cout << '|' << std::endl;
}
- std::cout << "+---+---+---+---+---+---+---+---+" << std::endl
- << "Fen is: " << to_fen() << std::endl
- << "Key is: " << st->key << std::endl;
-
- RequestPending = false;
-}
-
-
-/// Position::copy() creates a copy of the input position.
-
-void Position::copy(const Position& pos) {
-
- memcpy(this, &pos, sizeof(Position));
- saveState(); // detach and copy state info
+ cout << dottedLine << "Fen is: " << to_fen() << "\nKey is: " << st->key << endl;
}
/// Position:hidden_checkers<>() returns a bitboard of all pinned (against the
-/// king) pieces for the given color and for the given pinner type. Or, when
-/// template parameter FindPinned is false, the pieces of the given color
-/// candidate for a discovery check against the enemy king.
-/// Bitboard checkersBB must be already updated when looking for pinners.
-
+/// king) pieces for the given color. Or, when template parameter FindPinned is
+/// false, the function return the pieces of the given color candidate for a
+/// discovery check against the enemy king.
template
-Bitboard Position::hidden_checkers(Color c) const {
-
- Bitboard result = EmptyBoardBB;
- Bitboard pinners = pieces_of_color(FindPinned ? opposite_color(c) : c);
-
- // Pinned pieces protect our king, dicovery checks attack
- // the enemy king.
- Square ksq = king_square(FindPinned ? c : opposite_color(c));
+Bitboard Position::hidden_checkers() const {
- // Pinners are sliders, not checkers, that give check when candidate pinned is removed
- pinners &= (pieces(ROOK, QUEEN) & RookPseudoAttacks[ksq]) | (pieces(BISHOP, QUEEN) & BishopPseudoAttacks[ksq]);
+ // Pinned pieces protect our king, dicovery checks attack the enemy king
+ Bitboard b, result = 0;
+ Bitboard pinners = pieces(FindPinned ? flip(sideToMove) : sideToMove);
+ Square ksq = king_square(FindPinned ? sideToMove : flip(sideToMove));
- if (FindPinned && pinners)
- pinners &= ~st->checkersBB;
+ // Pinners are sliders, that give check when candidate pinned is removed
+ pinners &= (pieces(ROOK, QUEEN) & RookPseudoAttacks[ksq])
+ | (pieces(BISHOP, QUEEN) & BishopPseudoAttacks[ksq]);
while (pinners)
{
- Square s = pop_1st_bit(&pinners);
- Bitboard b = squares_between(s, ksq) & occupied_squares();
+ b = squares_between(ksq, pop_1st_bit(&pinners)) & occupied_squares();
- assert(b);
-
- if ( !(b & (b - 1)) // Only one bit set?
- && (b & pieces_of_color(c))) // Is an our piece?
+ // Only one bit set and is an our piece?
+ if (b && !(b & (b - 1)) && (b & pieces(sideToMove)))
result |= b;
}
return result;
}
+// Explicit template instantiations
+template Bitboard Position::hidden_checkers() const;
+template Bitboard Position::hidden_checkers() const;
-/// Position:pinned_pieces() returns a bitboard of all pinned (against the
-/// king) pieces for the given color. Note that checkersBB bitboard must
-/// be already updated.
-
-Bitboard Position::pinned_pieces(Color c) const {
-
- return hidden_checkers(c);
-}
-
-
-/// Position:discovered_check_candidates() returns a bitboard containing all
-/// pieces for the given side which are candidates for giving a discovered
-/// check. Contrary to pinned_pieces() here there is no need of checkersBB
-/// to be already updated.
-
-Bitboard Position::discovered_check_candidates(Color c) const {
- return hidden_checkers(c);
-}
-
-/// Position::attackers_to() computes a bitboard containing all pieces which
-/// attacks a given square.
+/// Position::attackers_to() computes a bitboard of all pieces which attack a
+/// given square. Slider attacks use occ bitboard as occupancy.
-Bitboard Position::attackers_to(Square s) const {
+Bitboard Position::attackers_to(Square s, Bitboard occ) const {
return (attacks_from(s, BLACK) & pieces(PAWN, WHITE))
| (attacks_from(s, WHITE) & pieces(PAWN, BLACK))
| (attacks_from(s) & pieces(KNIGHT))
- | (attacks_from(s) & pieces(ROOK, QUEEN))
- | (attacks_from(s) & pieces(BISHOP, QUEEN))
+ | (rook_attacks_bb(s, occ) & pieces(ROOK, QUEEN))
+ | (bishop_attacks_bb(s, occ) & pieces(BISHOP, QUEEN))
| (attacks_from(s) & pieces(KING));
}
-/// Position::attacks_from() computes a bitboard of all attacks
-/// of a given piece put in a given square.
-Bitboard Position::attacks_from(Piece p, Square s) const {
+/// Position::attacks_from() computes a bitboard of all attacks of a given piece
+/// put in a given square. Slider attacks use occ bitboard as occupancy.
+
+Bitboard Position::attacks_from(Piece p, Square s, Bitboard occ) {
assert(square_is_ok(s));
switch (p)
{
- case WP: return attacks_from(s, WHITE);
- case BP: return attacks_from(s, BLACK);
- case WN: case BN: return attacks_from(s);
- case WB: case BB: return attacks_from(s);
- case WR: case BR: return attacks_from(s);
- case WQ: case BQ: return attacks_from(s);
- case WK: case BK: return attacks_from(s);
- default: break;
+ case WB: case BB: return bishop_attacks_bb(s, occ);
+ case WR: case BR: return rook_attacks_bb(s, occ);
+ case WQ: case BQ: return bishop_attacks_bb(s, occ) | rook_attacks_bb(s, occ);
+ default: return StepAttacksBB[p][s];
}
- return false;
}
@@ -451,76 +416,61 @@ Bitboard Position::attacks_from(Piece p, Square s) const {
bool Position::move_attacks_square(Move m, Square s) const {
- assert(move_is_ok(m));
+ assert(is_ok(m));
assert(square_is_ok(s));
- Square f = move_from(m), t = move_to(m);
+ Bitboard occ, xray;
+ Square from = move_from(m);
+ Square to = move_to(m);
+ Piece piece = piece_on(from);
+
+ assert(!square_is_empty(from));
- assert(square_is_occupied(f));
+ // Update occupancy as if the piece is moving
+ occ = occupied_squares();
+ do_move_bb(&occ, make_move_bb(from, to));
- if (bit_is_set(attacks_from(piece_on(f), t), s))
+ // The piece moved in 'to' attacks the square 's' ?
+ if (bit_is_set(attacks_from(piece, to, occ), s))
return true;
- // Move the piece and scan for X-ray attacks behind it
- Bitboard occ = occupied_squares();
- Color us = color_of_piece_on(f);
- clear_bit(&occ, f);
- set_bit(&occ, t);
- Bitboard xray = ( (rook_attacks_bb(s, occ) & pieces(ROOK, QUEEN))
- |(bishop_attacks_bb(s, occ) & pieces(BISHOP, QUEEN))) & pieces_of_color(us);
+ // Scan for possible X-ray attackers behind the moved piece
+ xray = (rook_attacks_bb(s, occ) & pieces(ROOK, QUEEN, color_of(piece)))
+ |(bishop_attacks_bb(s, occ) & pieces(BISHOP, QUEEN, color_of(piece)));
- // If we have attacks we need to verify that are caused by our move
- // and are not already existent ones.
+ // Verify attackers are triggered by our move and not already existing
return xray && (xray ^ (xray & attacks_from(s)));
}
-/// Position::find_checkers() computes the checkersBB bitboard, which
-/// contains a nonzero bit for each checking piece (0, 1 or 2). It
-/// currently works by calling Position::attackers_to, which is probably
-/// inefficient. Consider rewriting this function to use the last move
-/// played, like in non-bitboard versions of Glaurung.
-
-void Position::find_checkers() {
-
- Color us = side_to_move();
- st->checkersBB = attackers_to(king_square(us)) & pieces_of_color(opposite_color(us));
-}
-
-
/// Position::pl_move_is_legal() tests whether a pseudo-legal move is legal
bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
- assert(is_ok());
- assert(move_is_ok(m));
- assert(pinned == pinned_pieces(side_to_move()));
-
- // Castling moves are checked for legality during move generation.
- if (move_is_castle(m))
- return true;
+ assert(is_ok(m));
+ assert(pinned == pinned_pieces());
Color us = side_to_move();
Square from = move_from(m);
- assert(color_of_piece_on(from) == us);
- assert(piece_on(king_square(us)) == piece_of_color_and_type(us, KING));
+ assert(color_of(piece_on(from)) == us);
+ assert(piece_on(king_square(us)) == make_piece(us, KING));
- // En passant captures are a tricky special case. Because they are
- // rather uncommon, we do it simply by testing whether the king is attacked
- // after the move is made
- if (move_is_ep(m))
+ // En passant captures are a tricky special case. Because they are rather
+ // uncommon, we do it simply by testing whether the king is attacked after
+ // the move is made.
+ if (is_enpassant(m))
{
- Color them = opposite_color(us);
+ Color them = flip(us);
Square to = move_to(m);
- Square capsq = make_square(square_file(to), square_rank(from));
- Bitboard b = occupied_squares();
+ Square capsq = to + pawn_push(them);
Square ksq = king_square(us);
+ Bitboard b = occupied_squares();
assert(to == ep_square());
- assert(piece_on(from) == piece_of_color_and_type(us, PAWN));
- assert(piece_on(capsq) == piece_of_color_and_type(them, PAWN));
- assert(piece_on(to) == EMPTY);
+ assert(piece_on(from) == make_piece(us, PAWN));
+ assert(piece_on(capsq) == make_piece(them, PAWN));
+ assert(piece_on(to) == PIECE_NONE);
clear_bit(&b, from);
clear_bit(&b, capsq);
@@ -531,62 +481,171 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
}
// If the moving piece is a king, check whether the destination
- // square is attacked by the opponent.
- if (type_of_piece_on(from) == KING)
- return !(attackers_to(move_to(m)) & pieces_of_color(opposite_color(us)));
+ // square is attacked by the opponent. Castling moves are checked
+ // for legality during move generation.
+ if (type_of(piece_on(from)) == KING)
+ return is_castle(m) || !(attackers_to(move_to(m)) & pieces(flip(us)));
// A non-king move is legal if and only if it is not pinned or it
// is moving along the ray towards or away from the king.
- return ( !pinned
- || !bit_is_set(pinned, from)
- || (direction_between_squares(from, king_square(us)) == direction_between_squares(move_to(m), king_square(us))));
+ return !pinned
+ || !bit_is_set(pinned, from)
+ || squares_aligned(from, move_to(m), king_square(us));
}
-/// Position::pl_move_is_evasion() tests whether a pseudo-legal move is a legal evasion
+/// Position::move_is_legal() takes a random move and tests whether the move
+/// is legal. This version is not very fast and should be used only in non
+/// time-critical paths.
-bool Position::pl_move_is_evasion(Move m, Bitboard pinned) const
-{
- assert(is_check());
+bool Position::move_is_legal(const Move m) const {
- Color us = side_to_move();
+ for (MoveList ml(*this); !ml.end(); ++ml)
+ if (ml.move() == m)
+ return true;
+
+ return false;
+}
+
+
+/// Position::is_pseudo_legal() takes a random move and tests whether the move
+/// is pseudo legal. It is used to validate moves from TT that can be corrupted
+/// due to SMP concurrent access or hash position key aliasing.
+
+bool Position::is_pseudo_legal(const Move m) const {
+
+ Color us = sideToMove;
+ Color them = flip(sideToMove);
Square from = move_from(m);
Square to = move_to(m);
+ Piece pc = piece_on(from);
- // King moves and en-passant captures are verified in pl_move_is_legal()
- if (type_of_piece_on(from) == KING || move_is_ep(m))
- return pl_move_is_legal(m, pinned);
+ // Use a slower but simpler function for uncommon cases
+ if (is_special(m))
+ return move_is_legal(m);
- Bitboard target = checkers();
- Square checksq = pop_1st_bit(&target);
+ // Is not a promotion, so promotion piece must be empty
+ if (promotion_piece_type(m) - 2 != PIECE_TYPE_NONE)
+ return false;
- if (target) // double check ?
+ // If the from square is not occupied by a piece belonging to the side to
+ // move, the move is obviously not legal.
+ if (pc == PIECE_NONE || color_of(pc) != us)
return false;
- // Our move must be a blocking evasion or a capture of the checking piece
- target = squares_between(checksq, king_square(us)) | checkers();
- return bit_is_set(target, to) && pl_move_is_legal(m, pinned);
-}
+ // The destination square cannot be occupied by a friendly piece
+ if (color_of(piece_on(to)) == us)
+ return false;
+
+ // Handle the special case of a pawn move
+ if (type_of(pc) == PAWN)
+ {
+ // Move direction must be compatible with pawn color
+ int direction = to - from;
+ if ((us == WHITE) != (direction > 0))
+ return false;
+
+ // We have already handled promotion moves, so destination
+ // cannot be on the 8/1th rank.
+ if (rank_of(to) == RANK_8 || rank_of(to) == RANK_1)
+ return false;
+
+ // Proceed according to the square delta between the origin and
+ // destination squares.
+ switch (direction)
+ {
+ case DELTA_NW:
+ case DELTA_NE:
+ case DELTA_SW:
+ case DELTA_SE:
+ // Capture. The destination square must be occupied by an enemy
+ // piece (en passant captures was handled earlier).
+ if (color_of(piece_on(to)) != them)
+ return false;
+
+ // From and to files must be one file apart, avoids a7h5
+ if (abs(file_of(from) - file_of(to)) != 1)
+ return false;
+ break;
+
+ case DELTA_N:
+ case DELTA_S:
+ // Pawn push. The destination square must be empty.
+ if (!square_is_empty(to))
+ return false;
+ break;
+
+ case DELTA_NN:
+ // Double white pawn push. The destination square must be on the fourth
+ // rank, and both the destination square and the square between the
+ // source and destination squares must be empty.
+ if ( rank_of(to) != RANK_4
+ || !square_is_empty(to)
+ || !square_is_empty(from + DELTA_N))
+ return false;
+ break;
+
+ case DELTA_SS:
+ // Double black pawn push. The destination square must be on the fifth
+ // rank, and both the destination square and the square between the
+ // source and destination squares must be empty.
+ if ( rank_of(to) != RANK_5
+ || !square_is_empty(to)
+ || !square_is_empty(from + DELTA_S))
+ return false;
+ break;
+
+ default:
+ return false;
+ }
+ }
+ else if (!bit_is_set(attacks_from(pc, from), to))
+ return false;
+ // Evasions generator already takes care to avoid some kind of illegal moves
+ // and pl_move_is_legal() relies on this. So we have to take care that the
+ // same kind of moves are filtered out here.
+ if (in_check())
+ {
+ // In case of king moves under check we have to remove king so to catch
+ // as invalid moves like b1a1 when opposite queen is on c1.
+ if (type_of(piece_on(from)) == KING)
+ {
+ Bitboard b = occupied_squares();
+ clear_bit(&b, from);
+ if (attackers_to(move_to(m), b) & pieces(flip(us)))
+ return false;
+ }
+ else
+ {
+ Bitboard target = checkers();
+ Square checksq = pop_1st_bit(&target);
-/// Position::move_is_check() tests whether a pseudo-legal move is a check
+ if (target) // double check ? In this case a king move is required
+ return false;
-bool Position::move_is_check(Move m) const {
+ // Our move must be a blocking evasion or a capture of the checking piece
+ target = squares_between(checksq, king_square(us)) | checkers();
+ if (!bit_is_set(target, move_to(m)))
+ return false;
+ }
+ }
- return move_is_check(m, CheckInfo(*this));
+ return true;
}
-bool Position::move_is_check(Move m, const CheckInfo& ci) const {
- assert(is_ok());
- assert(move_is_ok(m));
- assert(ci.dcCandidates == discovered_check_candidates(side_to_move()));
- assert(color_of_piece_on(move_from(m)) == side_to_move());
- assert(piece_on(ci.ksq) == piece_of_color_and_type(opposite_color(side_to_move()), KING));
+/// Position::move_gives_check() tests whether a pseudo-legal move gives a check
+
+bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
+
+ assert(is_ok(m));
+ assert(ci.dcCandidates == discovered_check_candidates());
+ assert(color_of(piece_on(move_from(m))) == side_to_move());
Square from = move_from(m);
Square to = move_to(m);
- PieceType pt = type_of_piece_on(from);
+ PieceType pt = type_of(piece_on(from));
// Direct check ?
if (bit_is_set(ci.checkSq[pt], to))
@@ -597,53 +656,41 @@ bool Position::move_is_check(Move m, const CheckInfo& ci) const {
{
// For pawn and king moves we need to verify also direction
if ( (pt != PAWN && pt != KING)
- ||(direction_between_squares(from, ci.ksq) != direction_between_squares(to, ci.ksq)))
+ || !squares_aligned(from, to, king_square(flip(side_to_move()))))
return true;
}
// Can we skip the ugly special cases ?
- if (!move_is_special(m))
+ if (!is_special(m))
return false;
Color us = side_to_move();
Bitboard b = occupied_squares();
+ Square ksq = king_square(flip(us));
// Promotion with check ?
- if (move_is_promotion(m))
+ if (is_promotion(m))
{
clear_bit(&b, from);
-
- switch (move_promotion_piece(m))
- {
- case KNIGHT:
- return bit_is_set(attacks_from(to), ci.ksq);
- case BISHOP:
- return bit_is_set(bishop_attacks_bb(to, b), ci.ksq);
- case ROOK:
- return bit_is_set(rook_attacks_bb(to, b), ci.ksq);
- case QUEEN:
- return bit_is_set(queen_attacks_bb(to, b), ci.ksq);
- default:
- assert(false);
- }
+ return bit_is_set(attacks_from(Piece(promotion_piece_type(m)), to, b), ksq);
}
- // En passant capture with check? We have already handled the case
+ // En passant capture with check ? We have already handled the case
// of direct checks and ordinary discovered check, the only case we
- // need to handle is the unusual case of a discovered check through the
- // captured pawn.
- if (move_is_ep(m))
+ // need to handle is the unusual case of a discovered check through
+ // the captured pawn.
+ if (is_enpassant(m))
{
- Square capsq = make_square(square_file(to), square_rank(from));
+ Square capsq = make_square(file_of(to), rank_of(from));
clear_bit(&b, from);
clear_bit(&b, capsq);
set_bit(&b, to);
- return (rook_attacks_bb(ci.ksq, b) & pieces(ROOK, QUEEN, us))
- ||(bishop_attacks_bb(ci.ksq, b) & pieces(BISHOP, QUEEN, us));
+ return (rook_attacks_bb(ksq, b) & pieces(ROOK, QUEEN, us))
+ ||(bishop_attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, us));
}
// Castling with check ?
- if (move_is_castle(m))
+ if (is_castle(m))
{
Square kfrom, kto, rfrom, rto;
kfrom = from;
@@ -661,7 +708,7 @@ bool Position::move_is_check(Move m, const CheckInfo& ci) const {
clear_bit(&b, rfrom);
set_bit(&b, rto);
set_bit(&b, kto);
- return bit_is_set(rook_attacks_bb(rto, b), ci.ksq);
+ return bit_is_set(rook_attacks_bb(rto, b), ksq);
}
return false;
@@ -669,42 +716,39 @@ bool Position::move_is_check(Move m, const CheckInfo& ci) const {
/// Position::do_move() makes a move, and saves all information necessary
-/// to a StateInfo object. The move is assumed to be legal.
-/// Pseudo-legal moves should be filtered out before this function is called.
+/// to a StateInfo object. The move is assumed to be legal. Pseudo-legal
+/// moves should be filtered out before this function is called.
void Position::do_move(Move m, StateInfo& newSt) {
CheckInfo ci(*this);
- do_move(m, newSt, ci, move_is_check(m, ci));
+ do_move(m, newSt, ci, move_gives_check(m, ci));
}
void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveIsCheck) {
- assert(is_ok());
- assert(move_is_ok(m));
+ assert(is_ok(m));
+ assert(&newSt != st);
- Bitboard key = st->key;
+ nodes++;
+ Key key = st->key;
- // Copy some fields of old state to our new StateInfo object except the
- // ones which are recalculated from scratch anyway, then switch our state
- // pointer to point to the new, ready to be updated, state.
+ // Copy some fields of old state to our new StateInfo object except the ones
+ // which are recalculated from scratch anyway, then switch our state pointer
+ // to point to the new, ready to be updated, state.
struct ReducedStateInfo {
Key pawnKey, materialKey;
+ Value npMaterial[2];
int castleRights, rule50, pliesFromNull;
- Square epSquare;
Score value;
- Value npMaterial[2];
+ Square epSquare;
};
memcpy(&newSt, st, sizeof(ReducedStateInfo));
+
newSt.previous = st;
st = &newSt;
- // Save the current key to the history[] array, in order to be able to
- // detect repetition draws.
- history[gamePly] = key;
- gamePly++;
-
// Update side to move
key ^= zobSideToMove;
@@ -713,31 +757,78 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
st->rule50++;
st->pliesFromNull++;
- if (move_is_castle(m))
+ if (is_castle(m))
{
st->key = key;
- do_castle_move(m);
+ do_castle_move(m);
return;
}
Color us = side_to_move();
- Color them = opposite_color(us);
+ Color them = flip(us);
Square from = move_from(m);
Square to = move_to(m);
- bool ep = move_is_ep(m);
- bool pm = move_is_promotion(m);
-
Piece piece = piece_on(from);
- PieceType pt = type_of_piece(piece);
- PieceType capture = ep ? PAWN : type_of_piece_on(to);
+ PieceType pt = type_of(piece);
+ PieceType capture = is_enpassant(m) ? PAWN : type_of(piece_on(to));
- assert(color_of_piece_on(from) == us);
- assert(color_of_piece_on(to) == them || square_is_empty(to));
- assert(!(ep || pm) || piece == piece_of_color_and_type(us, PAWN));
- assert(!pm || relative_rank(us, to) == RANK_8);
+ assert(color_of(piece) == us);
+ assert(color_of(piece_on(to)) != us);
+ assert(capture != KING);
if (capture)
- do_capture_move(key, capture, them, to, ep);
+ {
+ Square capsq = to;
+
+ // If the captured piece is a pawn, update pawn hash key, otherwise
+ // update non-pawn material.
+ if (capture == PAWN)
+ {
+ if (is_enpassant(m))
+ {
+ capsq += pawn_push(them);
+
+ assert(pt == PAWN);
+ assert(to == st->epSquare);
+ assert(relative_rank(us, to) == RANK_6);
+ assert(piece_on(to) == PIECE_NONE);
+ assert(piece_on(capsq) == make_piece(them, PAWN));
+
+ board[capsq] = PIECE_NONE;
+ }
+
+ st->pawnKey ^= zobrist[them][PAWN][capsq];
+ }
+ else
+ st->npMaterial[them] -= PieceValueMidgame[capture];
+
+ // Remove the captured piece
+ clear_bit(&byColorBB[them], capsq);
+ clear_bit(&byTypeBB[capture], capsq);
+ clear_bit(&occupied, capsq);
+
+ // Update piece list, move the last piece at index[capsq] position and
+ // shrink the list.
+ //
+ // WARNING: This is a not revresible operation. When we will reinsert the
+ // captured piece in undo_move() we will put it at the end of the list and
+ // not in its original place, it means index[] and pieceList[] are not
+ // guaranteed to be invariant to a do_move() + undo_move() sequence.
+ Square lastSquare = pieceList[them][capture][--pieceCount[them][capture]];
+ index[lastSquare] = index[capsq];
+ pieceList[them][capture][index[lastSquare]] = lastSquare;
+ pieceList[them][capture][pieceCount[them][capture]] = SQ_NONE;
+
+ // Update hash keys
+ key ^= zobrist[them][capture][capsq];
+ st->materialKey ^= zobrist[them][capture][pieceCount[them][capture]];
+
+ // Update incremental scores
+ st->value -= pst(make_piece(them, capture), capsq);
+
+ // Reset rule 50 counter
+ st->rule50 = 0;
+ }
// Update hash key
key ^= zobrist[us][pt][from] ^ zobrist[us][pt][to];
@@ -749,110 +840,105 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
st->epSquare = SQ_NONE;
}
- // Update castle rights, try to shortcut a common case
- int cm = castleRightsMask[from] & castleRightsMask[to];
- if (cm != ALL_CASTLES && ((cm & st->castleRights) != st->castleRights))
+ // Update castle rights if needed
+ if ( st->castleRights != CASTLES_NONE
+ && (castleRightsMask[from] & castleRightsMask[to]) != ALL_CASTLES)
{
key ^= zobCastle[st->castleRights];
- st->castleRights &= castleRightsMask[from];
- st->castleRights &= castleRightsMask[to];
+ st->castleRights &= castleRightsMask[from] & castleRightsMask[to];
key ^= zobCastle[st->castleRights];
}
// Prefetch TT access as soon as we know key is updated
- TT.prefetch(key);
+ prefetch((char*)TT.first_entry(key));
// Move the piece
Bitboard move_bb = make_move_bb(from, to);
- do_move_bb(&(byColorBB[us]), move_bb);
- do_move_bb(&(byTypeBB[pt]), move_bb);
- do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares
+ do_move_bb(&byColorBB[us], move_bb);
+ do_move_bb(&byTypeBB[pt], move_bb);
+ do_move_bb(&occupied, move_bb);
board[to] = board[from];
- board[from] = EMPTY;
+ board[from] = PIECE_NONE;
- // Update piece lists, note that index[from] is not updated and
- // becomes stale. This works as long as index[] is accessed just
- // by known occupied squares.
+ // Update piece lists, index[from] is not updated and becomes stale. This
+ // works as long as index[] is accessed just by known occupied squares.
index[to] = index[from];
pieceList[us][pt][index[to]] = to;
- // If the moving piece was a pawn do some special extra work
+ // If the moving piece is a pawn do some special extra work
if (pt == PAWN)
{
- // Reset rule 50 draw counter
- st->rule50 = 0;
+ // Set en-passant square, only if moved pawn can be captured
+ if ( (to ^ from) == 16
+ && (attacks_from(from + pawn_push(us), us) & pieces(PAWN, them)))
+ {
+ st->epSquare = Square((from + to) / 2);
+ key ^= zobEp[st->epSquare];
+ }
+
+ if (is_promotion(m))
+ {
+ PieceType promotion = promotion_piece_type(m);
+
+ assert(relative_rank(us, to) == RANK_8);
+ assert(promotion >= KNIGHT && promotion <= QUEEN);
+
+ // Replace the pawn with the promoted piece
+ clear_bit(&byTypeBB[PAWN], to);
+ set_bit(&byTypeBB[promotion], to);
+ board[to] = make_piece(us, promotion);
+
+ // Update piece lists, move the last pawn at index[to] position
+ // and shrink the list. Add a new promotion piece to the list.
+ Square lastSquare = pieceList[us][PAWN][--pieceCount[us][PAWN]];
+ index[lastSquare] = index[to];
+ pieceList[us][PAWN][index[lastSquare]] = lastSquare;
+ pieceList[us][PAWN][pieceCount[us][PAWN]] = SQ_NONE;
+ index[to] = pieceCount[us][promotion];
+ pieceList[us][promotion][index[to]] = to;
+
+ // Update hash keys
+ key ^= zobrist[us][PAWN][to] ^ zobrist[us][promotion][to];
+ st->pawnKey ^= zobrist[us][PAWN][to];
+ st->materialKey ^= zobrist[us][promotion][pieceCount[us][promotion]++]
+ ^ zobrist[us][PAWN][pieceCount[us][PAWN]];
+
+ // Update incremental score
+ st->value += pst(make_piece(us, promotion), to)
+ - pst(make_piece(us, PAWN), to);
+
+ // Update material
+ st->npMaterial[us] += PieceValueMidgame[promotion];
+ }
// Update pawn hash key
st->pawnKey ^= zobrist[us][PAWN][from] ^ zobrist[us][PAWN][to];
- // Set en passant square, only if moved pawn can be captured
- if ((to ^ from) == 16)
- {
- if (attacks_from(from + (us == WHITE ? DELTA_N : DELTA_S), us) & pieces(PAWN, them))
- {
- st->epSquare = Square((int(from) + int(to)) / 2);
- key ^= zobEp[st->epSquare];
- }
- }
+ // Reset rule 50 draw counter
+ st->rule50 = 0;
}
+ // Prefetch pawn and material hash tables
+ Threads[threadID].pawnTable.prefetch(st->pawnKey);
+ Threads[threadID].materialTable.prefetch(st->materialKey);
+
// Update incremental scores
st->value += pst_delta(piece, from, to);
// Set capture piece
- st->capture = capture;
-
- if (pm) // promotion ?
- {
- PieceType promotion = move_promotion_piece(m);
-
- assert(promotion >= KNIGHT && promotion <= QUEEN);
-
- // Insert promoted piece instead of pawn
- clear_bit(&(byTypeBB[PAWN]), to);
- set_bit(&(byTypeBB[promotion]), to);
- board[to] = piece_of_color_and_type(us, promotion);
-
- // Update material key
- st->materialKey ^= zobMaterial[us][PAWN][pieceCount[us][PAWN]];
- st->materialKey ^= zobMaterial[us][promotion][pieceCount[us][promotion]+1];
-
- // Update piece counts
- pieceCount[us][PAWN]--;
- pieceCount[us][promotion]++;
-
- // Update piece lists, move the last pawn at index[to] position
- // and shrink the list. Add a new promotion piece to the list.
- Square lastPawnSquare = pieceList[us][PAWN][pieceCount[us][PAWN]];
- index[lastPawnSquare] = index[to];
- pieceList[us][PAWN][index[lastPawnSquare]] = lastPawnSquare;
- pieceList[us][PAWN][pieceCount[us][PAWN]] = SQ_NONE;
- index[to] = pieceCount[us][promotion] - 1;
- pieceList[us][promotion][index[to]] = to;
-
- // Partially revert hash keys update
- key ^= zobrist[us][PAWN][to] ^ zobrist[us][promotion][to];
- st->pawnKey ^= zobrist[us][PAWN][to];
-
- // Partially revert and update incremental scores
- st->value -= pst(us, PAWN, to);
- st->value += pst(us, promotion, to);
-
- // Update material
- st->npMaterial[us] += piece_value_midgame(promotion);
- }
+ st->capturedType = capture;
// Update the key with the final value
st->key = key;
// Update checkers bitboard, piece must be already moved
- st->checkersBB = EmptyBoardBB;
+ st->checkersBB = 0;
if (moveIsCheck)
{
- if (ep | pm)
- st->checkersBB = attackers_to(king_square(them)) & pieces_of_color(us);
+ if (is_special(m))
+ st->checkersBB = attackers_to(king_square(them)) & pieces(us);
else
{
// Direct checks
@@ -863,179 +949,19 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from))
{
if (pt != ROOK)
- st->checkersBB |= (attacks_from(ci.ksq) & pieces(ROOK, QUEEN, us));
+ st->checkersBB |= attacks_from(king_square(them)) & pieces(ROOK, QUEEN, us);
if (pt != BISHOP)
- st->checkersBB |= (attacks_from(ci.ksq) & pieces(BISHOP, QUEEN, us));
+ st->checkersBB |= attacks_from(king_square(them)) & pieces(BISHOP, QUEEN, us);
}
}
}
// Finish
- sideToMove = opposite_color(sideToMove);
+ sideToMove = flip(sideToMove);
st->value += (sideToMove == WHITE ? TempoValue : -TempoValue);
- assert(is_ok());
-}
-
-
-/// Position::do_capture_move() is a private method used to update captured
-/// piece info. It is called from the main Position::do_move function.
-
-void Position::do_capture_move(Bitboard& key, PieceType capture, Color them, Square to, bool ep) {
-
- assert(capture != KING);
-
- Square capsq = to;
-
- if (ep) // en passant ?
- {
- capsq = (them == BLACK)? (to - DELTA_N) : (to - DELTA_S);
-
- assert(to == st->epSquare);
- assert(relative_rank(opposite_color(them), to) == RANK_6);
- assert(piece_on(to) == EMPTY);
- assert(piece_on(capsq) == piece_of_color_and_type(them, PAWN));
-
- board[capsq] = EMPTY;
- }
-
- // Remove captured piece
- clear_bit(&(byColorBB[them]), capsq);
- clear_bit(&(byTypeBB[capture]), capsq);
- clear_bit(&(byTypeBB[0]), capsq);
-
- // Update hash key
- key ^= zobrist[them][capture][capsq];
-
- // Update incremental scores
- st->value -= pst(them, capture, capsq);
-
- // If the captured piece was a pawn, update pawn hash key,
- // otherwise update non-pawn material.
- if (capture == PAWN)
- st->pawnKey ^= zobrist[them][PAWN][capsq];
- else
- st->npMaterial[them] -= piece_value_midgame(capture);
-
- // Update material hash key
- st->materialKey ^= zobMaterial[them][capture][pieceCount[them][capture]];
-
- // Update piece count
- pieceCount[them][capture]--;
-
- // Update piece list, move the last piece at index[capsq] position
- //
- // WARNING: This is a not perfectly revresible operation. When we
- // will reinsert the captured piece in undo_move() we will put it
- // at the end of the list and not in its original place, it means
- // index[] and pieceList[] are not guaranteed to be invariant to a
- // do_move() + undo_move() sequence.
- Square lastPieceSquare = pieceList[them][capture][pieceCount[them][capture]];
- index[lastPieceSquare] = index[capsq];
- pieceList[them][capture][index[lastPieceSquare]] = lastPieceSquare;
- pieceList[them][capture][pieceCount[them][capture]] = SQ_NONE;
-
- // Reset rule 50 counter
- st->rule50 = 0;
-}
-
-
-/// Position::do_castle_move() is a private method used to make a castling
-/// move. It is called from the main Position::do_move function. Note that
-/// castling moves are encoded as "king captures friendly rook" moves, for
-/// instance white short castling in a non-Chess960 game is encoded as e1h1.
-
-void Position::do_castle_move(Move m) {
-
- assert(move_is_ok(m));
- assert(move_is_castle(m));
-
- Color us = side_to_move();
- Color them = opposite_color(us);
-
- // Reset capture field
- st->capture = NO_PIECE_TYPE;
-
- // Find source squares for king and rook
- Square kfrom = move_from(m);
- Square rfrom = move_to(m); // HACK: See comment at beginning of function
- Square kto, rto;
-
- assert(piece_on(kfrom) == piece_of_color_and_type(us, KING));
- assert(piece_on(rfrom) == piece_of_color_and_type(us, ROOK));
-
- // Find destination squares for king and rook
- if (rfrom > kfrom) // O-O
- {
- kto = relative_square(us, SQ_G1);
- rto = relative_square(us, SQ_F1);
- } else { // O-O-O
- kto = relative_square(us, SQ_C1);
- rto = relative_square(us, SQ_D1);
- }
-
- // Remove pieces from source squares:
- clear_bit(&(byColorBB[us]), kfrom);
- clear_bit(&(byTypeBB[KING]), kfrom);
- clear_bit(&(byTypeBB[0]), kfrom); // HACK: byTypeBB[0] == occupied squares
- clear_bit(&(byColorBB[us]), rfrom);
- clear_bit(&(byTypeBB[ROOK]), rfrom);
- clear_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares
-
- // Put pieces on destination squares:
- set_bit(&(byColorBB[us]), kto);
- set_bit(&(byTypeBB[KING]), kto);
- set_bit(&(byTypeBB[0]), kto); // HACK: byTypeBB[0] == occupied squares
- set_bit(&(byColorBB[us]), rto);
- set_bit(&(byTypeBB[ROOK]), rto);
- set_bit(&(byTypeBB[0]), rto); // HACK: byTypeBB[0] == occupied squares
-
- // Update board array
- Piece king = piece_of_color_and_type(us, KING);
- Piece rook = piece_of_color_and_type(us, ROOK);
- board[kfrom] = board[rfrom] = EMPTY;
- board[kto] = king;
- board[rto] = rook;
-
- // Update piece lists
- pieceList[us][KING][index[kfrom]] = kto;
- pieceList[us][ROOK][index[rfrom]] = rto;
- int tmp = index[rfrom]; // In Chess960 could be rto == kfrom
- index[kto] = index[kfrom];
- index[rto] = tmp;
-
- // Update incremental scores
- st->value += pst_delta(king, kfrom, kto);
- st->value += pst_delta(rook, rfrom, rto);
-
- // Update hash key
- st->key ^= zobrist[us][KING][kfrom] ^ zobrist[us][KING][kto];
- st->key ^= zobrist[us][ROOK][rfrom] ^ zobrist[us][ROOK][rto];
-
- // Clear en passant square
- if (st->epSquare != SQ_NONE)
- {
- st->key ^= zobEp[st->epSquare];
- st->epSquare = SQ_NONE;
- }
-
- // Update castling rights
- st->key ^= zobCastle[st->castleRights];
- st->castleRights &= castleRightsMask[kfrom];
- st->key ^= zobCastle[st->castleRights];
-
- // Reset rule 50 counter
- st->rule50 = 0;
-
- // Update checkers BB
- st->checkersBB = attackers_to(king_square(them)) & pieces_of_color(us);
-
- // Finish
- sideToMove = opposite_color(sideToMove);
- st->value += (sideToMove == WHITE ? TempoValue : -TempoValue);
-
- assert(is_ok());
+ assert(pos_is_ok());
}
@@ -1044,233 +970,253 @@ void Position::do_castle_move(Move m) {
void Position::undo_move(Move m) {
- assert(is_ok());
- assert(move_is_ok(m));
+ assert(is_ok(m));
- gamePly--;
- sideToMove = opposite_color(sideToMove);
+ sideToMove = flip(sideToMove);
- if (move_is_castle(m))
+ if (is_castle(m))
{
- undo_castle_move(m);
+ do_castle_move(m);
return;
}
Color us = side_to_move();
- Color them = opposite_color(us);
+ Color them = flip(us);
Square from = move_from(m);
Square to = move_to(m);
- bool ep = move_is_ep(m);
- bool pm = move_is_promotion(m);
-
- PieceType pt = type_of_piece_on(to);
+ Piece piece = piece_on(to);
+ PieceType pt = type_of(piece);
+ PieceType capture = st->capturedType;
assert(square_is_empty(from));
- assert(color_of_piece_on(to) == us);
- assert(!pm || relative_rank(us, to) == RANK_8);
- assert(!ep || to == st->previous->epSquare);
- assert(!ep || relative_rank(us, to) == RANK_6);
- assert(!ep || piece_on(to) == piece_of_color_and_type(us, PAWN));
+ assert(color_of(piece) == us);
+ assert(capture != KING);
- if (pm) // promotion ?
+ if (is_promotion(m))
{
- PieceType promotion = move_promotion_piece(m);
- pt = PAWN;
+ PieceType promotion = promotion_piece_type(m);
+ assert(promotion == pt);
+ assert(relative_rank(us, to) == RANK_8);
assert(promotion >= KNIGHT && promotion <= QUEEN);
- assert(piece_on(to) == piece_of_color_and_type(us, promotion));
-
- // Replace promoted piece with a pawn
- clear_bit(&(byTypeBB[promotion]), to);
- set_bit(&(byTypeBB[PAWN]), to);
- // Update piece counts
- pieceCount[us][promotion]--;
- pieceCount[us][PAWN]++;
+ // Replace the promoted piece with the pawn
+ clear_bit(&byTypeBB[promotion], to);
+ set_bit(&byTypeBB[PAWN], to);
+ board[to] = make_piece(us, PAWN);
- // Update piece list replacing promotion piece with a pawn
- Square lastPromotionSquare = pieceList[us][promotion][pieceCount[us][promotion]];
- index[lastPromotionSquare] = index[to];
- pieceList[us][promotion][index[lastPromotionSquare]] = lastPromotionSquare;
+ // Update piece lists, move the last promoted piece at index[to] position
+ // and shrink the list. Add a new pawn to the list.
+ Square lastSquare = pieceList[us][promotion][--pieceCount[us][promotion]];
+ index[lastSquare] = index[to];
+ pieceList[us][promotion][index[lastSquare]] = lastSquare;
pieceList[us][promotion][pieceCount[us][promotion]] = SQ_NONE;
- index[to] = pieceCount[us][PAWN] - 1;
+ index[to] = pieceCount[us][PAWN]++;
pieceList[us][PAWN][index[to]] = to;
- }
+ pt = PAWN;
+ }
// Put the piece back at the source square
Bitboard move_bb = make_move_bb(to, from);
- do_move_bb(&(byColorBB[us]), move_bb);
- do_move_bb(&(byTypeBB[pt]), move_bb);
- do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares
+ do_move_bb(&byColorBB[us], move_bb);
+ do_move_bb(&byTypeBB[pt], move_bb);
+ do_move_bb(&occupied, move_bb);
- board[from] = piece_of_color_and_type(us, pt);
- board[to] = EMPTY;
+ board[from] = board[to];
+ board[to] = PIECE_NONE;
- // Update piece list
+ // Update piece lists, index[to] is not updated and becomes stale. This
+ // works as long as index[] is accessed just by known occupied squares.
index[from] = index[to];
pieceList[us][pt][index[from]] = from;
- if (st->capture)
+ if (capture)
{
Square capsq = to;
- if (ep)
- capsq = (us == WHITE)? (to - DELTA_N) : (to - DELTA_S);
+ if (is_enpassant(m))
+ {
+ capsq -= pawn_push(us);
- assert(st->capture != KING);
- assert(!ep || square_is_empty(capsq));
+ assert(pt == PAWN);
+ assert(to == st->previous->epSquare);
+ assert(relative_rank(us, to) == RANK_6);
+ assert(piece_on(capsq) == PIECE_NONE);
+ }
// Restore the captured piece
- set_bit(&(byColorBB[them]), capsq);
- set_bit(&(byTypeBB[st->capture]), capsq);
- set_bit(&(byTypeBB[0]), capsq);
-
- board[capsq] = piece_of_color_and_type(them, st->capture);
+ set_bit(&byColorBB[them], capsq);
+ set_bit(&byTypeBB[capture], capsq);
+ set_bit(&occupied, capsq);
- // Update piece count
- pieceCount[them][st->capture]++;
+ board[capsq] = make_piece(them, capture);
// Update piece list, add a new captured piece in capsq square
- index[capsq] = pieceCount[them][st->capture] - 1;
- pieceList[them][st->capture][index[capsq]] = capsq;
+ index[capsq] = pieceCount[them][capture]++;
+ pieceList[them][capture][index[capsq]] = capsq;
}
// Finally point our state pointer back to the previous state
st = st->previous;
- assert(is_ok());
+ assert(pos_is_ok());
}
-/// Position::undo_castle_move() is a private method used to unmake a castling
-/// move. It is called from the main Position::undo_move function. Note that
-/// castling moves are encoded as "king captures friendly rook" moves, for
-/// instance white short castling in a non-Chess960 game is encoded as e1h1.
+/// Position::do_castle_move() is a private method used to do/undo a castling
+/// move. Note that castling moves are encoded as "king captures friendly rook"
+/// moves, for instance white short castling in a non-Chess960 game is encoded
+/// as e1h1.
+template
+void Position::do_castle_move(Move m) {
-void Position::undo_castle_move(Move m) {
+ assert(is_ok(m));
+ assert(is_castle(m));
- assert(move_is_ok(m));
- assert(move_is_castle(m));
+ Square kto, kfrom, rfrom, rto, kAfter, rAfter;
- // When we have arrived here, some work has already been done by
- // Position::undo_move. In particular, the side to move has been switched,
- // so the code below is correct.
Color us = side_to_move();
+ Square kBefore = move_from(m);
+ Square rBefore = move_to(m);
- // Find source squares for king and rook
- Square kfrom = move_from(m);
- Square rfrom = move_to(m); // HACK: See comment at beginning of function
- Square kto, rto;
-
- // Find destination squares for king and rook
- if (rfrom > kfrom) // O-O
+ // Find after-castle squares for king and rook
+ if (rBefore > kBefore) // O-O
{
- kto = relative_square(us, SQ_G1);
- rto = relative_square(us, SQ_F1);
- } else { // O-O-O
- kto = relative_square(us, SQ_C1);
- rto = relative_square(us, SQ_D1);
+ kAfter = relative_square(us, SQ_G1);
+ rAfter = relative_square(us, SQ_F1);
}
+ else // O-O-O
+ {
+ kAfter = relative_square(us, SQ_C1);
+ rAfter = relative_square(us, SQ_D1);
+ }
+
+ kfrom = Do ? kBefore : kAfter;
+ rfrom = Do ? rBefore : rAfter;
+
+ kto = Do ? kAfter : kBefore;
+ rto = Do ? rAfter : rBefore;
- assert(piece_on(kto) == piece_of_color_and_type(us, KING));
- assert(piece_on(rto) == piece_of_color_and_type(us, ROOK));
-
- // Remove pieces from destination squares:
- clear_bit(&(byColorBB[us]), kto);
- clear_bit(&(byTypeBB[KING]), kto);
- clear_bit(&(byTypeBB[0]), kto); // HACK: byTypeBB[0] == occupied squares
- clear_bit(&(byColorBB[us]), rto);
- clear_bit(&(byTypeBB[ROOK]), rto);
- clear_bit(&(byTypeBB[0]), rto); // HACK: byTypeBB[0] == occupied squares
-
- // Put pieces on source squares:
- set_bit(&(byColorBB[us]), kfrom);
- set_bit(&(byTypeBB[KING]), kfrom);
- set_bit(&(byTypeBB[0]), kfrom); // HACK: byTypeBB[0] == occupied squares
- set_bit(&(byColorBB[us]), rfrom);
- set_bit(&(byTypeBB[ROOK]), rfrom);
- set_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares
+ assert(piece_on(kfrom) == make_piece(us, KING));
+ assert(piece_on(rfrom) == make_piece(us, ROOK));
+
+ // Remove pieces from source squares
+ clear_bit(&byColorBB[us], kfrom);
+ clear_bit(&byTypeBB[KING], kfrom);
+ clear_bit(&occupied, kfrom);
+ clear_bit(&byColorBB[us], rfrom);
+ clear_bit(&byTypeBB[ROOK], rfrom);
+ clear_bit(&occupied, rfrom);
+
+ // Put pieces on destination squares
+ set_bit(&byColorBB[us], kto);
+ set_bit(&byTypeBB[KING], kto);
+ set_bit(&occupied, kto);
+ set_bit(&byColorBB[us], rto);
+ set_bit(&byTypeBB[ROOK], rto);
+ set_bit(&occupied, rto);
// Update board
- board[rto] = board[kto] = EMPTY;
- board[rfrom] = piece_of_color_and_type(us, ROOK);
- board[kfrom] = piece_of_color_and_type(us, KING);
+ Piece king = make_piece(us, KING);
+ Piece rook = make_piece(us, ROOK);
+ board[kfrom] = board[rfrom] = PIECE_NONE;
+ board[kto] = king;
+ board[rto] = rook;
// Update piece lists
- pieceList[us][KING][index[kto]] = kfrom;
- pieceList[us][ROOK][index[rto]] = rfrom;
- int tmp = index[rto]; // In Chess960 could be rto == kfrom
- index[kfrom] = index[kto];
- index[rfrom] = tmp;
+ pieceList[us][KING][index[kfrom]] = kto;
+ pieceList[us][ROOK][index[rfrom]] = rto;
+ int tmp = index[rfrom]; // In Chess960 could be kto == rfrom
+ index[kto] = index[kfrom];
+ index[rto] = tmp;
- // Finally point our state pointer back to the previous state
- st = st->previous;
+ if (Do)
+ {
+ // Reset capture field
+ st->capturedType = PIECE_TYPE_NONE;
- assert(is_ok());
-}
+ // Update incremental scores
+ st->value += pst_delta(king, kfrom, kto);
+ st->value += pst_delta(rook, rfrom, rto);
+ // Update hash key
+ st->key ^= zobrist[us][KING][kfrom] ^ zobrist[us][KING][kto];
+ st->key ^= zobrist[us][ROOK][rfrom] ^ zobrist[us][ROOK][rto];
-/// Position::do_null_move makes() a "null move": It switches the side to move
-/// and updates the hash key without executing any move on the board.
+ // Clear en passant square
+ if (st->epSquare != SQ_NONE)
+ {
+ st->key ^= zobEp[st->epSquare];
+ st->epSquare = SQ_NONE;
+ }
-void Position::do_null_move(StateInfo& backupSt) {
+ // Update castling rights
+ st->key ^= zobCastle[st->castleRights];
+ st->castleRights &= castleRightsMask[kfrom];
+ st->key ^= zobCastle[st->castleRights];
- assert(is_ok());
- assert(!is_check());
+ // Reset rule 50 counter
+ st->rule50 = 0;
- // Back up the information necessary to undo the null move to the supplied
- // StateInfo object.
- // Note that differently from normal case here backupSt is actually used as
- // a backup storage not as a new state to be used.
- backupSt.key = st->key;
- backupSt.epSquare = st->epSquare;
- backupSt.value = st->value;
- backupSt.previous = st->previous;
- backupSt.pliesFromNull = st->pliesFromNull;
- st->previous = &backupSt;
-
- // Save the current key to the history[] array, in order to be able to
- // detect repetition draws.
- history[gamePly] = st->key;
-
- // Update the necessary information
- if (st->epSquare != SQ_NONE)
- st->key ^= zobEp[st->epSquare];
+ // Update checkers BB
+ st->checkersBB = attackers_to(king_square(flip(us))) & pieces(us);
- st->key ^= zobSideToMove;
- TT.prefetch(st->key);
+ // Finish
+ sideToMove = flip(sideToMove);
+ st->value += (sideToMove == WHITE ? TempoValue : -TempoValue);
+ }
+ else
+ // Undo: point our state pointer back to the previous state
+ st = st->previous;
- sideToMove = opposite_color(sideToMove);
- st->epSquare = SQ_NONE;
- st->rule50++;
- st->pliesFromNull = 0;
- st->value += (sideToMove == WHITE) ? TempoValue : -TempoValue;
- gamePly++;
+ assert(pos_is_ok());
}
-/// Position::undo_null_move() unmakes a "null move".
+/// Position::do_null_move() is used to do/undo a "null move": It flips the side
+/// to move and updates the hash key without executing any move on the board.
+template
+void Position::do_null_move(StateInfo& backupSt) {
+
+ assert(!in_check());
+
+ // Back up the information necessary to undo the null move to the supplied
+ // StateInfo object. Note that differently from normal case here backupSt
+ // is actually used as a backup storage not as the new state. This reduces
+ // the number of fields to be copied.
+ StateInfo* src = Do ? st : &backupSt;
+ StateInfo* dst = Do ? &backupSt : st;
+
+ dst->key = src->key;
+ dst->epSquare = src->epSquare;
+ dst->value = src->value;
+ dst->rule50 = src->rule50;
+ dst->pliesFromNull = src->pliesFromNull;
+
+ sideToMove = flip(sideToMove);
-void Position::undo_null_move() {
+ if (Do)
+ {
+ if (st->epSquare != SQ_NONE)
+ st->key ^= zobEp[st->epSquare];
- assert(is_ok());
- assert(!is_check());
+ st->key ^= zobSideToMove;
+ prefetch((char*)TT.first_entry(st->key));
- // Restore information from the our backup StateInfo object
- StateInfo* backupSt = st->previous;
- st->key = backupSt->key;
- st->epSquare = backupSt->epSquare;
- st->value = backupSt->value;
- st->previous = backupSt->previous;
- st->pliesFromNull = backupSt->pliesFromNull;
+ st->epSquare = SQ_NONE;
+ st->rule50++;
+ st->pliesFromNull = 0;
+ st->value += (sideToMove == WHITE) ? TempoValue : -TempoValue;
+ }
- // Update the necessary information
- sideToMove = opposite_color(sideToMove);
- st->rule50--;
- gamePly--;
+ assert(pos_is_ok());
}
+// Explicit template instantiations
+template void Position::do_null_move(StateInfo& backupSt);
+template void Position::do_null_move(StateInfo& backupSt);
+
/// Position::see() is a static exchange evaluator: It tries to estimate the
/// material gain or loss resulting from a move. There are three versions of
@@ -1278,112 +1224,66 @@ void Position::undo_null_move() {
/// move, and one which takes a 'from' and a 'to' square. The function does
/// not yet understand promotions captures.
-int Position::see(Square to) const {
-
- assert(square_is_ok(to));
- return see(SQ_NONE, to);
-}
-
-int Position::see(Move m) const {
-
- assert(move_is_ok(m));
- return see(move_from(m), move_to(m));
-}
-
int Position::see_sign(Move m) const {
- assert(move_is_ok(m));
+ assert(is_ok(m));
Square from = move_from(m);
Square to = move_to(m);
- // Early return if SEE cannot be negative because capturing piece value
- // is not bigger then captured one.
- if ( midgame_value_of_piece_on(from) <= midgame_value_of_piece_on(to)
- && type_of_piece_on(from) != KING)
- return 1;
+ // Early return if SEE cannot be negative because captured piece value
+ // is not less then capturing one. Note that king moves always return
+ // here because king midgame value is set to 0.
+ if (PieceValueMidgame[piece_on(to)] >= PieceValueMidgame[piece_on(from)])
+ return 1;
- return see(from, to);
+ return see(m);
}
-int Position::see(Square from, Square to) const {
-
- // Material values
- static const int seeValues[18] = {
- 0, PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
- RookValueMidgame, QueenValueMidgame, QueenValueMidgame*10, 0,
- 0, PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
- RookValueMidgame, QueenValueMidgame, QueenValueMidgame*10, 0,
- 0, 0
- };
-
- Bitboard attackers, stmAttackers, b;
+int Position::see(Move m) const {
- assert(square_is_ok(from) || from == SQ_NONE);
- assert(square_is_ok(to));
+ Square from, to;
+ Bitboard occ, attackers, stmAttackers, b;
+ int swapList[32], slIndex = 1;
+ PieceType capturedType, pt;
+ Color stm;
- // Initialize colors
- Color us = (from != SQ_NONE ? color_of_piece_on(from) : opposite_color(color_of_piece_on(to)));
- Color them = opposite_color(us);
+ assert(is_ok(m));
- // Initialize pieces
- Piece piece = piece_on(from);
- Piece capture = piece_on(to);
- Bitboard occ = occupied_squares();
+ // As castle moves are implemented as capturing the rook, they have
+ // SEE == RookValueMidgame most of the times (unless the rook is under
+ // attack).
+ if (is_castle(m))
+ return 0;
- // King cannot be recaptured
- if (type_of_piece(piece) == KING)
- return seeValues[capture];
+ from = move_from(m);
+ to = move_to(m);
+ capturedType = type_of(piece_on(to));
+ occ = occupied_squares();
// Handle en passant moves
- if (st->epSquare == to && type_of_piece_on(from) == PAWN)
+ if (is_enpassant(m))
{
- assert(capture == EMPTY);
+ Square capQq = to - pawn_push(side_to_move());
- Square capQq = (side_to_move() == WHITE)? (to - DELTA_N) : (to - DELTA_S);
- capture = piece_on(capQq);
- assert(type_of_piece_on(capQq) == PAWN);
+ assert(capturedType == PIECE_TYPE_NONE);
+ assert(type_of(piece_on(capQq)) == PAWN);
// Remove the captured pawn
clear_bit(&occ, capQq);
+ capturedType = PAWN;
}
- while (true)
- {
- // Find all attackers to the destination square, with the moving piece
- // removed, but possibly an X-ray attacker added behind it.
- clear_bit(&occ, from);
- attackers = (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN))
- | (bishop_attacks_bb(to, occ) & pieces(BISHOP, QUEEN))
- | (attacks_from(to) & pieces(KNIGHT))
- | (attacks_from(to) & pieces(KING))
- | (attacks_from(to, WHITE) & pieces(PAWN, BLACK))
- | (attacks_from(to, BLACK) & pieces(PAWN, WHITE));
-
- if (from != SQ_NONE)
- break;
-
- // If we don't have any attacker we are finished
- if ((attackers & pieces_of_color(us)) == EmptyBoardBB)
- return 0;
-
- // Locate the least valuable attacker to the destination square
- // and use it to initialize from square.
- stmAttackers = attackers & pieces_of_color(us);
- PieceType pt;
- for (pt = PAWN; !(stmAttackers & pieces(pt)); pt++)
- assert(pt < KING);
-
- from = first_1(stmAttackers & pieces(pt));
- piece = piece_on(from);
- }
+ // Find all attackers to the destination square, with the moving piece
+ // removed, but possibly an X-ray attacker added behind it.
+ clear_bit(&occ, from);
+ attackers = attackers_to(to, occ);
// If the opponent has no attackers we are finished
- stmAttackers = attackers & pieces_of_color(them);
+ stm = flip(color_of(piece_on(from)));
+ stmAttackers = attackers & pieces(stm);
if (!stmAttackers)
- return seeValues[capture];
-
- attackers &= occ; // Remove the moving piece
+ return PieceValueMidgame[capturedType];
// The destination square is defended, which makes things rather more
// difficult to compute. We proceed by building up a "swap list" containing
@@ -1391,12 +1291,8 @@ int Position::see(Square from, Square to) const {
// destination square, where the sides alternately capture, and always
// capture with the least valuable piece. After each capture, we look for
// new X-ray attacks from behind the capturing piece.
- int lastCapturingPieceValue = seeValues[piece];
- int swapList[32], n = 1;
- Color c = them;
- PieceType pt;
-
- swapList[0] = seeValues[capture];
+ swapList[0] = PieceValueMidgame[capturedType];
+ capturedType = type_of(piece_on(from));
do {
// Locate the least valuable attacker for the side to move. The loop
@@ -1405,57 +1301,44 @@ int Position::see(Square from, Square to) const {
for (pt = PAWN; !(stmAttackers & pieces(pt)); pt++)
assert(pt < KING);
- // Remove the attacker we just found from the 'attackers' bitboard,
+ // Remove the attacker we just found from the 'occupied' bitboard,
// and scan for new X-ray attacks behind the attacker.
b = stmAttackers & pieces(pt);
occ ^= (b & (~b + 1));
- attackers |= (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN))
+ attackers |= (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN))
| (bishop_attacks_bb(to, occ) & pieces(BISHOP, QUEEN));
- attackers &= occ;
+ attackers &= occ; // Cut out pieces we've already done
// Add the new entry to the swap list
- assert(n < 32);
- swapList[n] = -swapList[n - 1] + lastCapturingPieceValue;
- n++;
-
- // Remember the value of the capturing piece, and change the side to move
- // before beginning the next iteration
- lastCapturingPieceValue = seeValues[pt];
- c = opposite_color(c);
- stmAttackers = attackers & pieces_of_color(c);
-
- // Stop after a king capture
- if (pt == KING && stmAttackers)
+ assert(slIndex < 32);
+ swapList[slIndex] = -swapList[slIndex - 1] + PieceValueMidgame[capturedType];
+ slIndex++;
+
+ // Remember the value of the capturing piece, and change the side to
+ // move before beginning the next iteration.
+ capturedType = pt;
+ stm = flip(stm);
+ stmAttackers = attackers & pieces(stm);
+
+ // Stop before processing a king capture
+ if (capturedType == KING && stmAttackers)
{
- assert(n < 32);
- swapList[n++] = QueenValueMidgame*10;
+ assert(slIndex < 32);
+ swapList[slIndex++] = QueenValueMidgame*10;
break;
}
} while (stmAttackers);
// Having built the swap list, we negamax through it to find the best
- // achievable score from the point of view of the side to move
- while (--n)
- swapList[n-1] = Min(-swapList[n], swapList[n-1]);
+ // achievable score from the point of view of the side to move.
+ while (--slIndex)
+ swapList[slIndex-1] = std::min(-swapList[slIndex], swapList[slIndex-1]);
return swapList[0];
}
-/// Position::saveState() copies the content of the current state
-/// inside startState and makes st point to it. This is needed
-/// when the st pointee could become stale, as example because
-/// the caller is about to going out of scope.
-
-void Position::saveState() {
-
- startState = *st;
- st = &startState;
- st->previous = NULL; // as a safe guard
-}
-
-
/// Position::clear() erases the position object to a pristine state, with an
/// empty board, white to move, and no castling rights.
@@ -1470,68 +1353,36 @@ void Position::clear() {
memset(pieceCount, 0, sizeof(int) * 2 * 8);
memset(index, 0, sizeof(int) * 64);
- for (int i = 0; i < 64; i++)
- board[i] = EMPTY;
-
for (int i = 0; i < 8; i++)
for (int j = 0; j < 16; j++)
pieceList[0][i][j] = pieceList[1][i][j] = SQ_NONE;
+ for (Square sq = SQ_A1; sq <= SQ_H8; sq++)
+ {
+ board[sq] = PIECE_NONE;
+ castleRightsMask[sq] = ALL_CASTLES;
+ }
sideToMove = WHITE;
- gamePly = 0;
- initialKFile = FILE_E;
- initialKRFile = FILE_H;
- initialQRFile = FILE_A;
-}
-
-
-/// Position::reset_game_ply() simply sets gamePly to 0. It is used from the
-/// UCI interface code, whenever a non-reversible move is made in a
-/// 'position fen moves m1 m2 ...' command. This makes it possible
-/// for the program to handle games of arbitrary length, as long as the GUI
-/// handles draws by the 50 move rule correctly.
-
-void Position::reset_game_ply() {
-
- gamePly = 0;
+ nodes = 0;
+ occupied = 0;
}
/// Position::put_piece() puts a piece on the given square of the board,
-/// updating the board array, bitboards, and piece counts.
+/// updating the board array, pieces list, bitboards, and piece counts.
void Position::put_piece(Piece p, Square s) {
- Color c = color_of_piece(p);
- PieceType pt = type_of_piece(p);
+ Color c = color_of(p);
+ PieceType pt = type_of(p);
board[s] = p;
- index[s] = pieceCount[c][pt];
+ index[s] = pieceCount[c][pt]++;
pieceList[c][pt][index[s]] = s;
- set_bit(&(byTypeBB[pt]), s);
- set_bit(&(byColorBB[c]), s);
- set_bit(&byTypeBB[0], s); // HACK: byTypeBB[0] contains all occupied squares.
-
- pieceCount[c][pt]++;
-}
-
-
-/// Position::allow_oo() gives the given side the right to castle kingside.
-/// Used when setting castling rights during parsing of FEN strings.
-
-void Position::allow_oo(Color c) {
-
- st->castleRights |= (1 + int(c));
-}
-
-
-/// Position::allow_ooo() gives the given side the right to castle queenside.
-/// Used when setting castling rights during parsing of FEN strings.
-
-void Position::allow_ooo(Color c) {
-
- st->castleRights |= (4 + 4*int(c));
+ set_bit(&byTypeBB[pt], s);
+ set_bit(&byColorBB[c], s);
+ set_bit(&occupied, s);
}
@@ -1542,16 +1393,15 @@ void Position::allow_ooo(Color c) {
Key Position::compute_key() const {
- Key result = Key(0ULL);
+ Key result = zobCastle[st->castleRights];
for (Square s = SQ_A1; s <= SQ_H8; s++)
- if (square_is_occupied(s))
- result ^= zobrist[color_of_piece_on(s)][type_of_piece_on(s)][s];
+ if (!square_is_empty(s))
+ result ^= zobrist[color_of(piece_on(s))][type_of(piece_on(s))][s];
if (ep_square() != SQ_NONE)
result ^= zobEp[ep_square()];
- result ^= zobCastle[st->castleRights];
if (side_to_move() == BLACK)
result ^= zobSideToMove;
@@ -1567,18 +1417,14 @@ Key Position::compute_key() const {
Key Position::compute_pawn_key() const {
- Key result = Key(0ULL);
Bitboard b;
- Square s;
+ Key result = 0;
for (Color c = WHITE; c <= BLACK; c++)
{
b = pieces(PAWN, c);
while (b)
- {
- s = pop_1st_bit(&b);
- result ^= zobrist[c][PAWN][s];
- }
+ result ^= zobrist[c][PAWN][pop_1st_bit(&b)];
}
return result;
}
@@ -1592,14 +1438,13 @@ Key Position::compute_pawn_key() const {
Key Position::compute_material_key() const {
- Key result = Key(0ULL);
+ Key result = 0;
+
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= QUEEN; pt++)
- {
- int count = piece_count(c, pt);
- for (int i = 0; i <= count; i++)
- result ^= zobMaterial[c][pt][i];
- }
+ for (int i = 0; i < piece_count(c, pt); i++)
+ result ^= zobrist[c][pt][i];
+
return result;
}
@@ -1610,20 +1455,15 @@ Key Position::compute_material_key() const {
/// updated by do_move and undo_move when the program is running in debug mode.
Score Position::compute_value() const {
- Score result = make_score(0, 0);
Bitboard b;
- Square s;
+ Score result = SCORE_ZERO;
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= KING; pt++)
{
b = pieces(pt, c);
while (b)
- {
- s = pop_1st_bit(&b);
- assert(piece_on(s) == piece_of_color_and_type(c, pt));
- result += pst(c, pt, s);
- }
+ result += pst(make_piece(c, pt), pop_1st_bit(&b));
}
result += (side_to_move() == WHITE ? TempoValue / 2 : -TempoValue / 2);
@@ -1632,24 +1472,17 @@ Score Position::compute_value() const {
/// Position::compute_non_pawn_material() computes the total non-pawn middle
-/// game material score for the given side. Material scores are updated
+/// game material value for the given side. Material values are updated
/// incrementally during the search, this function is only used while
/// initializing a new Position object.
Value Position::compute_non_pawn_material(Color c) const {
- Value result = Value(0);
+ Value result = VALUE_ZERO;
for (PieceType pt = KNIGHT; pt <= QUEEN; pt++)
- {
- Bitboard b = pieces(pt, c);
- while (b)
- {
- assert(piece_on(first_1(b)) == piece_of_color_and_type(c, pt));
- pop_1st_bit(&b);
- result += piece_value_midgame(pt);
- }
- }
+ result += piece_count(c, pt) * PieceValueMidgame[pt];
+
return result;
}
@@ -1657,7 +1490,7 @@ Value Position::compute_non_pawn_material(Color c) const {
/// Position::is_draw() tests whether the position is drawn by material,
/// repetition, or the 50 moves rule. It does not detect stalemates, this
/// must be done by the search.
-
+template
bool Position::is_draw() const {
// Draw by material?
@@ -1666,170 +1499,119 @@ bool Position::is_draw() const {
return true;
// Draw by the 50 moves rule?
- if (st->rule50 > 100 || (st->rule50 == 100 && !is_check()))
+ if (st->rule50 > 99 && !is_mate())
return true;
// Draw by repetition?
- for (int i = 2; i < Min(Min(gamePly, st->rule50), st->pliesFromNull); i += 2)
- if (history[gamePly - i] == st->key)
- return true;
-
- return false;
-}
-
-
-/// Position::is_mate() returns true or false depending on whether the
-/// side to move is checkmated.
-
-bool Position::is_mate() const {
-
- MoveStack moves[256];
- return is_check() && (generate_moves(*this, moves, false) == moves);
-}
-
-
-/// Position::has_mate_threat() tests whether a given color has a mate in one
-/// from the current position.
+ if (!SkipRepetition)
+ {
+ int i = 4, e = std::min(st->rule50, st->pliesFromNull);
-bool Position::has_mate_threat(Color c) {
+ if (i <= e)
+ {
+ StateInfo* stp = st->previous->previous;
- StateInfo st1, st2;
- Color stm = side_to_move();
+ do {
+ stp = stp->previous->previous;
- if (is_check())
- return false;
+ if (stp->key == st->key)
+ return true;
- // If the input color is not equal to the side to move, do a null move
- if (c != stm)
- do_null_move(st1);
+ i +=2;
- MoveStack mlist[120];
- bool result = false;
- Bitboard pinned = pinned_pieces(sideToMove);
+ } while (i <= e);
+ }
+ }
- // Generate pseudo-legal non-capture and capture check moves
- MoveStack* last = generate_non_capture_checks(*this, mlist);
- last = generate_captures(*this, last);
+ return false;
+}
- // Loop through the moves, and see if one of them is mate
- for (MoveStack* cur = mlist; cur != last; cur++)
- {
- Move move = cur->move;
- if (!pl_move_is_legal(move, pinned))
- continue;
+// Explicit template instantiations
+template bool Position::is_draw() const;
+template bool Position::is_draw() const;
- do_move(move, st2);
- if (is_mate())
- result = true;
- undo_move(move);
- }
+/// Position::is_mate() returns true or false depending on whether the
+/// side to move is checkmated.
- // Undo null move, if necessary
- if (c != stm)
- undo_null_move();
+bool Position::is_mate() const {
- return result;
+ return in_check() && !MoveList(*this).size();
}
-/// Position::init_zobrist() is a static member function which initializes the
-/// various arrays used to compute hash keys.
-
-void Position::init_zobrist() {
-
- for (int i = 0; i < 2; i++)
- for (int j = 0; j < 8; j++)
- for (int k = 0; k < 64; k++)
- zobrist[i][j][k] = Key(genrand_int64());
+/// Position::init() is a static member function which initializes at startup
+/// the various arrays used to compute hash keys and the piece square tables.
+/// The latter is a two-step operation: First, the white halves of the tables
+/// are copied from PSQT[] tables. Second, the black halves of the tables are
+/// initialized by flipping and changing the sign of the white scores.
- for (int i = 0; i < 64; i++)
- zobEp[i] = Key(genrand_int64());
+void Position::init() {
- for (int i = 0; i < 16; i++)
- zobCastle[i] = genrand_int64();
+ RKISS rk;
- zobSideToMove = genrand_int64();
+ for (Color c = WHITE; c <= BLACK; c++)
+ for (PieceType pt = PAWN; pt <= KING; pt++)
+ for (Square s = SQ_A1; s <= SQ_H8; s++)
+ zobrist[c][pt][s] = rk.rand();
- for (int i = 0; i < 2; i++)
- for (int j = 0; j < 8; j++)
- for (int k = 0; k < 16; k++)
- zobMaterial[i][j][k] = (k > 0)? Key(genrand_int64()) : Key(0LL);
+ for (Square s = SQ_A1; s <= SQ_H8; s++)
+ zobEp[s] = rk.rand();
for (int i = 0; i < 16; i++)
- zobMaterial[0][KING][i] = zobMaterial[1][KING][i] = Key(0ULL);
-
- zobExclusion = genrand_int64();
-}
-
+ zobCastle[i] = rk.rand();
-/// Position::init_piece_square_tables() initializes the piece square tables.
-/// This is a two-step operation: First, the white halves of the tables are
-/// copied from the MgPST[][] and EgPST[][] arrays, with a small random number
-/// added to each entry if the "Randomness" UCI parameter is non-zero.
-/// Second, the black halves of the tables are initialized by mirroring
-/// and changing the sign of the corresponding white scores.
+ zobSideToMove = rk.rand();
+ zobExclusion = rk.rand();
-void Position::init_piece_square_tables() {
+ for (Piece p = WP; p <= WK; p++)
+ {
+ Score ps = make_score(PieceValueMidgame[p], PieceValueEndgame[p]);
- int r = get_option_value_int("Randomness"), i;
- for (Square s = SQ_A1; s <= SQ_H8; s++)
- for (Piece p = WP; p <= WK; p++)
+ for (Square s = SQ_A1; s <= SQ_H8; s++)
{
- i = (r == 0)? 0 : (genrand_int32() % (r*2) - r);
- PieceSquareTable[p][s] = make_score(MgPST[p][s] + i, EgPST[p][s] + i);
+ pieceSquareTable[p][s] = ps + PSQT[p][s];
+ pieceSquareTable[p+8][flip(s)] = -pieceSquareTable[p][s];
}
-
- for (Square s = SQ_A1; s <= SQ_H8; s++)
- for (Piece p = BP; p <= BK; p++)
- PieceSquareTable[p][s] = -PieceSquareTable[p-8][flip_square(s)];
+ }
}
-/// Position::flipped_copy() makes a copy of the input position, but with
-/// the white and black sides reversed. This is only useful for debugging,
-/// especially for finding evaluation symmetry bugs.
+/// Position::flip_me() flips position with the white and black sides reversed. This
+/// is only useful for debugging especially for finding evaluation symmetry bugs.
-void Position::flipped_copy(const Position& pos) {
+void Position::flip_me() {
- assert(pos.is_ok());
+ // Make a copy of current position before to start changing
+ const Position pos(*this, threadID);
clear();
+ threadID = pos.thread();
// Board
for (Square s = SQ_A1; s <= SQ_H8; s++)
if (!pos.square_is_empty(s))
- put_piece(Piece(int(pos.piece_on(s)) ^ 8), flip_square(s));
+ put_piece(Piece(pos.piece_on(s) ^ 8), flip(s));
// Side to move
- sideToMove = opposite_color(pos.side_to_move());
+ sideToMove = flip(pos.side_to_move());
// Castling rights
- if (pos.can_castle_kingside(WHITE)) allow_oo(BLACK);
- if (pos.can_castle_queenside(WHITE)) allow_ooo(BLACK);
- if (pos.can_castle_kingside(BLACK)) allow_oo(WHITE);
- if (pos.can_castle_queenside(BLACK)) allow_ooo(WHITE);
-
- initialKFile = pos.initialKFile;
- initialKRFile = pos.initialKRFile;
- initialQRFile = pos.initialQRFile;
-
- for (Square sq = SQ_A1; sq <= SQ_H8; sq++)
- castleRightsMask[sq] = ALL_CASTLES;
-
- castleRightsMask[make_square(initialKFile, RANK_1)] ^= (WHITE_OO | WHITE_OOO);
- castleRightsMask[make_square(initialKFile, RANK_8)] ^= (BLACK_OO | BLACK_OOO);
- castleRightsMask[make_square(initialKRFile, RANK_1)] ^= WHITE_OO;
- castleRightsMask[make_square(initialKRFile, RANK_8)] ^= BLACK_OO;
- castleRightsMask[make_square(initialQRFile, RANK_1)] ^= WHITE_OOO;
- castleRightsMask[make_square(initialQRFile, RANK_8)] ^= BLACK_OOO;
+ if (pos.can_castle(WHITE_OO))
+ set_castle_right(king_square(BLACK), flip(pos.castle_rook_square(WHITE_OO)));
+ if (pos.can_castle(WHITE_OOO))
+ set_castle_right(king_square(BLACK), flip(pos.castle_rook_square(WHITE_OOO)));
+ if (pos.can_castle(BLACK_OO))
+ set_castle_right(king_square(WHITE), flip(pos.castle_rook_square(BLACK_OO)));
+ if (pos.can_castle(BLACK_OOO))
+ set_castle_right(king_square(WHITE), flip(pos.castle_rook_square(BLACK_OOO)));
// En passant square
if (pos.st->epSquare != SQ_NONE)
- st->epSquare = flip_square(pos.st->epSquare);
+ st->epSquare = flip(pos.st->epSquare);
// Checkers
- find_checkers();
+ st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(flip(sideToMove));
// Hash keys
st->key = compute_key();
@@ -1843,33 +1625,35 @@ void Position::flipped_copy(const Position& pos) {
st->npMaterial[WHITE] = compute_non_pawn_material(WHITE);
st->npMaterial[BLACK] = compute_non_pawn_material(BLACK);
- assert(is_ok());
+ assert(pos_is_ok());
}
-/// Position::is_ok() performs some consitency checks for the position object.
+/// Position::pos_is_ok() performs some consitency checks for the position object.
/// This is meant to be helpful when debugging.
-bool Position::is_ok(int* failedStep) const {
+bool Position::pos_is_ok(int* failedStep) const {
// What features of the position should be verified?
- static const bool debugBitboards = false;
- static const bool debugKingCount = false;
- static const bool debugKingCapture = false;
- static const bool debugCheckerCount = false;
- static const bool debugKey = false;
- static const bool debugMaterialKey = false;
- static const bool debugPawnKey = false;
- static const bool debugIncrementalEval = false;
- static const bool debugNonPawnMaterial = false;
- static const bool debugPieceCounts = false;
- static const bool debugPieceList = false;
- static const bool debugCastleSquares = false;
+ const bool debugAll = false;
+
+ const bool debugBitboards = debugAll || false;
+ const bool debugKingCount = debugAll || false;
+ const bool debugKingCapture = debugAll || false;
+ const bool debugCheckerCount = debugAll || false;
+ const bool debugKey = debugAll || false;
+ const bool debugMaterialKey = debugAll || false;
+ const bool debugPawnKey = debugAll || false;
+ const bool debugIncrementalEval = debugAll || false;
+ const bool debugNonPawnMaterial = debugAll || false;
+ const bool debugPieceCounts = debugAll || false;
+ const bool debugPieceList = debugAll || false;
+ const bool debugCastleSquares = debugAll || false;
if (failedStep) *failedStep = 1;
// Side to move OK?
- if (!color_is_ok(side_to_move()))
+ if (side_to_move() != WHITE && side_to_move() != BLACK)
return false;
// Are the king squares in the position correct?
@@ -1881,22 +1665,14 @@ bool Position::is_ok(int* failedStep) const {
if (piece_on(king_square(BLACK)) != BK)
return false;
- // Castle files OK?
- if (failedStep) (*failedStep)++;
- if (!file_is_ok(initialKRFile))
- return false;
-
- if (!file_is_ok(initialQRFile))
- return false;
-
// Do both sides have exactly one king?
if (failedStep) (*failedStep)++;
if (debugKingCount)
{
int kingCount[2] = {0, 0};
for (Square s = SQ_A1; s <= SQ_H8; s++)
- if (type_of_piece_on(s) == KING)
- kingCount[color_of_piece_on(s)]++;
+ if (type_of(piece_on(s)) == KING)
+ kingCount[color_of(piece_on(s))]++;
if (kingCount[0] != 1 || kingCount[1] != 1)
return false;
@@ -1907,15 +1683,15 @@ bool Position::is_ok(int* failedStep) const {
if (debugKingCapture)
{
Color us = side_to_move();
- Color them = opposite_color(us);
+ Color them = flip(us);
Square ksq = king_square(them);
- if (attackers_to(ksq) & pieces_of_color(us))
+ if (attackers_to(ksq) & pieces(us))
return false;
}
// Is there more than 2 checkers?
if (failedStep) (*failedStep)++;
- if (debugCheckerCount && count_1s(st->checkersBB) > 2)
+ if (debugCheckerCount && count_1s(st->checkersBB) > 2)
return false;
// Bitboards OK?
@@ -1923,12 +1699,12 @@ bool Position::is_ok(int* failedStep) const {
if (debugBitboards)
{
// The intersection of the white and black pieces must be empty
- if ((pieces_of_color(WHITE) & pieces_of_color(BLACK)) != EmptyBoardBB)
+ if (!(pieces(WHITE) & pieces(BLACK)))
return false;
// The union of the white and black pieces must be equal to all
// occupied squares
- if ((pieces_of_color(WHITE) | pieces_of_color(BLACK)) != occupied_squares())
+ if ((pieces(WHITE) | pieces(BLACK)) != occupied_squares())
return false;
// Separate piece type bitboards must have empty intersections
@@ -1984,41 +1760,35 @@ bool Position::is_ok(int* failedStep) const {
if (debugPieceCounts)
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= KING; pt++)
- if (pieceCount[c][pt] != count_1s(pieces(pt, c)))
+ if (pieceCount[c][pt] != count_1s(pieces(pt, c)))
return false;
if (failedStep) (*failedStep)++;
if (debugPieceList)
- {
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= KING; pt++)
for (int i = 0; i < pieceCount[c][pt]; i++)
{
- if (piece_on(piece_list(c, pt, i)) != piece_of_color_and_type(c, pt))
+ if (piece_on(piece_list(c, pt)[i]) != make_piece(c, pt))
return false;
- if (index[piece_list(c, pt, i)] != i)
+ if (index[piece_list(c, pt)[i]] != i)
return false;
}
- }
if (failedStep) (*failedStep)++;
- if (debugCastleSquares) {
- for (Color c = WHITE; c <= BLACK; c++) {
- if (can_castle_kingside(c) && piece_on(initial_kr_square(c)) != piece_of_color_and_type(c, ROOK))
- return false;
- if (can_castle_queenside(c) && piece_on(initial_qr_square(c)) != piece_of_color_and_type(c, ROOK))
+ if (debugCastleSquares)
+ for (CastleRight f = WHITE_OO; f <= BLACK_OOO; f = CastleRight(f << 1))
+ {
+ if (!can_castle(f))
+ continue;
+
+ Piece rook = (f & (WHITE_OO | WHITE_OOO) ? WR : BR);
+
+ if ( castleRightsMask[castleRookSquare[f]] != (ALL_CASTLES ^ f)
+ || piece_on(castleRookSquare[f]) != rook)
return false;
}
- if (castleRightsMask[initial_kr_square(WHITE)] != (ALL_CASTLES ^ WHITE_OO))
- return false;
- if (castleRightsMask[initial_qr_square(WHITE)] != (ALL_CASTLES ^ WHITE_OOO))
- return false;
- if (castleRightsMask[initial_kr_square(BLACK)] != (ALL_CASTLES ^ BLACK_OO))
- return false;
- if (castleRightsMask[initial_qr_square(BLACK)] != (ALL_CASTLES ^ BLACK_OOO))
- return false;
- }
if (failedStep) *failedStep = 0;
return true;