X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=c8132d5e513d2a1b2d4aa6a711f96e1440b0b5f7;hp=2126741e717ae4fbb2cf1d14013d3d47f9d79c2f;hb=252537fd9c8cb60f765ea390d2464a42adeafc0a;hpb=c2048136ec73a1d4437d286d34539a05910d83d7 diff --git a/src/position.cpp b/src/position.cpp index 2126741e..c8132d5e 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -22,6 +22,7 @@ //// Includes //// +#include #include #include #include @@ -43,6 +44,8 @@ using std::string; using std::cout; using std::endl; +static inline bool isZero(char c) { return c == '0'; } + struct PieceLetters : std::map { PieceLetters() { @@ -53,6 +56,18 @@ struct PieceLetters : std::map { operator[]('B') = WB; operator[]('b') = BB; operator[]('N') = WN; operator[]('n') = BN; operator[]('P') = WP; operator[]('p') = BP; + operator[](' ') = PIECE_NONE; operator[]('.') = PIECE_NONE_DARK_SQ; + } + + char from_piece(Piece p) const { + + std::map::const_iterator it; + for (it = begin(); it != end(); ++it) + if (it->second == p) + return it->first; + + assert(false); + return 0; } }; @@ -68,7 +83,7 @@ Key Position::zobExclusion; Score Position::PieceSquareTable[16][64]; -static bool RequestPending = false; +static PieceLetters pieceLetters; /// Constructors @@ -155,8 +170,6 @@ void Position::from_fen(const string& fen) { 6) Fullmove number: The number of the full move. It starts at 1, and is incremented after Black's move. */ - static PieceLetters pieceLetters; - char token; std::istringstream ss(fen); Rank rank = RANK_8; @@ -299,67 +312,59 @@ bool Position::set_castling_rights(char token) { } -/// Position::to_fen() converts the position object to a FEN string. This is -/// probably only useful for debugging. +/// 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; + Square sq; + char emptyCnt = '0'; for (Rank rank = RANK_8; rank >= RANK_1; rank--) { - skip = 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_occupied(sq)) { - fen += (char)skip + '0'; - skip = 0; - } - fen += pieceLetters[piece_on(sq)]; + fen += emptyCnt; + fen += pieceLetters.from_piece(piece_on(sq)); + emptyCnt = '0'; + } else + emptyCnt++; } - if (skip > 0) - fen += (char)skip + '0'; - - fen += (rank > RANK_1 ? '/' : ' '); + fen += emptyCnt; + fen += '/'; + emptyCnt = '0'; } - fen += (sideToMove == WHITE ? "w " : "b "); - if (st->castleRights != NO_CASTLES) + + fen.erase(std::remove_if(fen.begin(), fen.end(), isZero), fen.end()); + fen.erase(--fen.end()); + fen += (sideToMove == WHITE ? " w " : " b "); + + if (st->castleRights != CASTLES_NONE) { - 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 += '-'; + const bool Chess960 = initialKFile != FILE_E + || initialQRFile != FILE_A + || initialKRFile != FILE_H; - fen += ' '; - if (ep_square() != SQ_NONE) - fen += square_to_string(ep_square()); - else + if (can_castle_kingside(WHITE)) + fen += Chess960 ? char(toupper(file_to_char(initialKRFile))) : 'K'; + + if (can_castle_queenside(WHITE)) + fen += Chess960 ? char(toupper(file_to_char(initialQRFile))) : 'Q'; + + if (can_castle_kingside(BLACK)) + fen += Chess960 ? file_to_char(initialKRFile) : 'k'; + + if (can_castle_queenside(BLACK)) + fen += Chess960 ? file_to_char(initialQRFile) : 'q'; + } else fen += '-'; + fen += (ep_square() == SQ_NONE ? " -" : " " + square_to_string(ep_square())); return fen; } @@ -367,44 +372,42 @@ const string Position::to_fen() const { /// Position::print() prints an ASCII representation of the position to /// the standard output. If a move is given then also the san is print. -void Position::print(Move m) const { +void Position::print(Move move) const { - static const string pieceLetters = " PNBRQK PNBRQK ."; + const char* dottedLine = "\n+---+---+---+---+---+---+---+---+\n"; + static bool requestPending = false; // Check for reentrancy, as example when called from inside // MovePicker that is used also here in move_to_san() - if (RequestPending) + if (requestPending) return; - RequestPending = true; + requestPending = true; - cout << endl; - if (m != MOVE_NONE) + if (move) { Position p(*this, thread()); - string col = (color_of_piece_on(move_from(m)) == BLACK ? ".." : ""); - cout << "Move is: " << col << move_to_san(p, m) << endl; + string dd = (color_of_piece_on(move_from(move)) == BLACK ? ".." : ""); + cout << "\nMove is: " << dd << move_to_san(p, move); } + for (Rank rank = RANK_8; rank >= RANK_1; rank--) { - cout << "+---+---+---+---+---+---+---+---+" << endl; + cout << dottedLine << '|'; for (File file = FILE_A; file <= FILE_H; file++) { Square sq = make_square(file, rank); + char c = (color_of_piece_on(sq) == BLACK ? '=' : ' '); Piece piece = piece_on(sq); - if (piece == EMPTY && square_color(sq) == WHITE) - piece = NO_PIECE; - char col = (color_of_piece_on(sq) == BLACK ? '=' : ' '); - cout << '|' << col << pieceLetters[piece] << col; + if (piece == PIECE_NONE && square_color(sq) == DARK) + piece = PIECE_NONE_DARK_SQ; + + cout << c << pieceLetters.from_piece(piece) << c << '|'; } - cout << '|' << endl; } - cout << "+---+---+---+---+---+---+---+---+" << endl - << "Fen is: " << to_fen() << endl - << "Key is: " << st->key << endl; - - RequestPending = false; + cout << dottedLine << "Fen is: " << to_fen() << "\nKey is: " << st->key << endl; + requestPending = false; } @@ -574,7 +577,7 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const { 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(to) == PIECE_NONE); clear_bit(&b, from); clear_bit(&b, capsq); @@ -822,7 +825,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares 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 @@ -894,7 +897,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI st->value += pst_delta(piece, from, to); // Set capture piece - st->capture = capture; + st->capturedType = capture; // Update the key with the final value st->key = key; @@ -951,10 +954,10 @@ void Position::do_capture_move(Key& key, PieceType capture, Color them, Square t assert(to == st->epSquare); assert(relative_rank(opposite_color(them), to) == RANK_6); - assert(piece_on(to) == EMPTY); + assert(piece_on(to) == PIECE_NONE); assert(piece_on(capsq) == piece_of_color_and_type(them, PAWN)); - board[capsq] = EMPTY; + board[capsq] = PIECE_NONE; } st->pawnKey ^= zobrist[them][PAWN][capsq]; } @@ -1009,7 +1012,7 @@ void Position::do_castle_move(Move m) { Color them = opposite_color(us); // Reset capture field - st->capture = NO_PIECE_TYPE; + st->capturedType = PIECE_TYPE_NONE; // Find source squares for king and rook Square kfrom = move_from(m); @@ -1048,7 +1051,7 @@ void Position::do_castle_move(Move m) { // 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[kfrom] = board[rfrom] = PIECE_NONE; board[kto] = king; board[rto] = rook; @@ -1157,35 +1160,35 @@ void Position::undo_move(Move m) { do_move_bb(&(byTypeBB[0]), move_bb); // HACK: byTypeBB[0] == occupied squares board[from] = piece_of_color_and_type(us, pt); - board[to] = EMPTY; + board[to] = PIECE_NONE; // Update piece list index[from] = index[to]; pieceList[us][pt][index[from]] = from; - if (st->capture) + if (st->capturedType) { Square capsq = to; if (ep) capsq = (us == WHITE)? (to - DELTA_N) : (to - DELTA_S); - assert(st->capture != KING); + assert(st->capturedType != KING); assert(!ep || square_is_empty(capsq)); // Restore the captured piece set_bit(&(byColorBB[them]), capsq); - set_bit(&(byTypeBB[st->capture]), capsq); + set_bit(&(byTypeBB[st->capturedType]), capsq); set_bit(&(byTypeBB[0]), capsq); - board[capsq] = piece_of_color_and_type(them, st->capture); + board[capsq] = piece_of_color_and_type(them, st->capturedType); // Update piece count - pieceCount[them][st->capture]++; + pieceCount[them][st->capturedType]++; // 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][st->capturedType] - 1; + pieceList[them][st->capturedType][index[capsq]] = capsq; } // Finally point our state pointer back to the previous state @@ -1245,7 +1248,7 @@ void Position::undo_castle_move(Move m) { set_bit(&(byTypeBB[0]), rfrom); // HACK: byTypeBB[0] == occupied squares // Update board - board[rto] = board[kto] = EMPTY; + board[rto] = board[kto] = PIECE_NONE; board[rfrom] = piece_of_color_and_type(us, ROOK); board[kfrom] = piece_of_color_and_type(us, KING); @@ -1389,7 +1392,7 @@ int Position::see(Square from, Square to) const { // Handle en passant moves if (st->epSquare == to && type_of_piece_on(from) == PAWN) { - assert(capture == EMPTY); + assert(capture == PIECE_NONE); Square capQq = (side_to_move() == WHITE)? (to - DELTA_N) : (to - DELTA_S); capture = piece_on(capQq); @@ -1502,6 +1505,7 @@ void Position::clear() { st = &startState; memset(st, 0, sizeof(StateInfo)); st->epSquare = SQ_NONE; + startPosPlyCounter = 0; memset(byColorBB, 0, sizeof(Bitboard) * 2); memset(byTypeBB, 0, sizeof(Bitboard) * 8); @@ -1509,7 +1513,7 @@ void Position::clear() { memset(index, 0, sizeof(int) * 64); for (int i = 0; i < 64; i++) - board[i] = EMPTY; + board[i] = PIECE_NONE; for (int i = 0; i < 8; i++) for (int j = 0; j < 16; j++) @@ -1536,6 +1540,10 @@ void Position::reset_game_ply() { st->gamePly = 0; } +void Position::inc_startpos_ply_counter() { + + startPosPlyCounter++; +} /// Position::put_piece() puts a piece on the given square of the board, /// updating the board array, bitboards, and piece counts. @@ -1725,82 +1733,79 @@ bool Position::is_draw() const { bool Position::is_mate() const { MoveStack moves[256]; - return is_check() && (generate_moves(*this, moves, false) == moves); + return is_check() && (generate_moves(*this, moves) == moves); } -/// Position::has_mate_threat() tests whether a given color has a mate in one -/// from the current position. +/// Position::has_mate_threat() tests whether the side to move is under +/// a threat of being mated in one from the current position. -bool Position::has_mate_threat(Color c) { +bool Position::has_mate_threat() { + MoveStack mlist[256], *last, *cur; StateInfo st1, st2; - Color stm = side_to_move(); + bool mateFound = false; + // If we are under check it's up to evasions to do the job if (is_check()) return false; - // If the input color is not equal to the side to move, do a null move - if (c != stm) - do_null_move(st1); + // First pass the move to our opponent doing a null move + do_null_move(st1); - MoveStack mlist[120]; - bool result = false; - Bitboard pinned = pinned_pieces(sideToMove); - - // Generate pseudo-legal non-capture and capture check moves - MoveStack* last = generate_non_capture_checks(*this, mlist); + // Then generate pseudo-legal moves that give check + last = generate_non_capture_checks(*this, mlist); last = generate_captures(*this, last); - // Loop through the moves, and see if one of them is mate - for (MoveStack* cur = mlist; cur != last; cur++) + // Loop through the moves, and see if one of them gives mate + Bitboard pinned = pinned_pieces(sideToMove); + CheckInfo ci(*this); + for (cur = mlist; cur != last && !mateFound; cur++) { Move move = cur->move; - if (!pl_move_is_legal(move, pinned)) + if ( !pl_move_is_legal(move, pinned) + || !move_is_check(move, ci)) continue; - do_move(move, st2); + do_move(move, st2, ci, true); + if (is_mate()) - result = true; + mateFound = true; undo_move(move); } - // Undo null move, if necessary - if (c != stm) - undo_null_move(); - - return result; + undo_null_move(); + return mateFound; } -/// Position::init_zobrist() is a static member function which initializes the -/// various arrays used to compute hash keys. +/// Position::init_zobrist() is a static member function which initializes at +/// startup 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()); + int i,j, k; - for (int i = 0; i < 64; i++) + for (i = 0; i < 2; i++) for (j = 0; j < 8; j++) for (k = 0; k < 64; k++) + zobrist[i][j][k] = Key(genrand_int64()); + + for (i = 0; i < 64; i++) zobEp[i] = Key(genrand_int64()); - for (int i = 0; i < 16; i++) - zobCastle[i] = genrand_int64(); + for (i = 0; i < 16; i++) + zobCastle[i] = Key(genrand_int64()); - zobSideToMove = genrand_int64(); - zobExclusion = genrand_int64(); + zobSideToMove = Key(genrand_int64()); + zobExclusion = Key(genrand_int64()); } /// 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. -/// Second, the black halves of the tables are initialized by mirroring -/// and changing the sign of the corresponding white scores. +/// This is a two-step operation: First, the white halves of the tables are +/// copied from the MgPST[][] and EgPST[][] arrays. Second, the black halves +/// of the tables are initialized by mirroring and changing the sign of the +/// corresponding white scores. void Position::init_piece_square_tables() {