X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=bc94fe82acb02b064c4d7b1203efed8d4d36ace8;hp=0dbbbddf81449b399386e7ae8e87585ffb4f90ca;hb=ffb638995d21077f5a7632b6d57e4edc7637611b;hpb=c9b24c3358a26afdec5e33e369b6192039562971 diff --git a/src/position.cpp b/src/position.cpp index 0dbbbddf..bc94fe82 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -158,14 +158,13 @@ void Position::from_fen(const string& fen, bool isChess960) { 6) Fullmove number: The number of the full move. It starts at 1, and is incremented after Black's move. */ - char token; + char col, row, token; size_t p; - string ep; Square sq = SQ_A8; std::istringstream ss(fen); clear(); - ss >> std::skipws >> token >> std::noskipws; + ss >> token >> std::noskipws; // 1. Piece placement while (!isspace(token)) @@ -186,38 +185,29 @@ void Position::from_fen(const string& fen, bool isChess960) { } // 2. Active color - ss >> std::skipws >> token; + ss >> token; sideToMove = (token == 'w' ? WHITE : BLACK); + ss >> token; // 3. Castling availability - ss >> token >> std::noskipws; - while (token != '-' && !isspace(token)) - { + while ((ss >> token) && !isspace(token)) set_castling_rights(token); - ss >> token; - } // 4. En passant square. Ignore if no pawn capture is possible - ss >> std::skipws >> ep; - if (ep.size() == 2) + if ( ((ss >> col) && (col >= 'a' && col <= 'h')) + && ((ss >> row) && (row == '3' || row == '6'))) { - st->epSquare = make_square(File(ep[0] - 'a'), Rank(ep[1] - '1')); + st->epSquare = make_square(File(col - 'a'), Rank(row - '1')); + Color them = opposite_color(sideToMove); - if (!(attackers_to(st->epSquare) & pieces(PAWN, sideToMove))) + if (!(attacks_from(st->epSquare, them) & pieces(PAWN, sideToMove))) st->epSquare = SQ_NONE; } // 5-6. Halfmove clock and fullmove number - ss >> st->rule50 >> fullMoves; + ss >> std::skipws >> st->rule50 >> fullMoves; // Various initialisations - 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; - chess960 = isChess960; find_checkers(); @@ -230,6 +220,18 @@ void Position::from_fen(const string& fen, bool isChess960) { } +/// Position::set_castle() is an helper function used to set +/// correct castling related flags. + +void Position::set_castle(int f, Square ksq, Square rsq) { + + st->castleRights |= f; + castleRightsMask[ksq] ^= f; + castleRightsMask[rsq] ^= f; + castleRookSquare[f] = rsq; +} + + /// Position::set_castling_rights() sets castling parameters castling avaiability. /// This function is compatible with 3 standards: Normal FEN standard, Shredder-FEN /// that uses the letters of the columns on which the rooks began the game instead @@ -244,43 +246,24 @@ void Position::set_castling_rights(char token) { Square sqA = relative_square(c, SQ_A1); Square sqH = relative_square(c, SQ_H1); - initialKFile = square_file(king_square(c)); + Square rsq, ksq = king_square(c); + token = toupper(token); - if (toupper(token) == 'K') - { - for (Square sq = sqH; sq >= sqA; sq--) - if (piece_on(sq) == make_piece(c, ROOK)) - { - set_castle_kingside(c); - initialKRFile = square_file(sq); - break; - } - } - else if (toupper(token) == 'Q') - { - for (Square sq = sqA; sq <= sqH; sq++) - if (piece_on(sq) == make_piece(c, ROOK)) - { - set_castle_queenside(c); - initialQRFile = square_file(sq); - break; - } - } - else if (toupper(token) >= 'A' && toupper(token) <= 'H') - { - File rookFile = File(toupper(token) - 'A'); + if (token == 'K') + for (rsq = sqH; piece_on(rsq) != make_piece(c, ROOK); rsq--) {} - if (rookFile < initialKFile) - { - set_castle_queenside(c); - initialQRFile = rookFile; - } - else - { - set_castle_kingside(c); - initialKRFile = rookFile; - } - } + else if (token == 'Q') + for (rsq = sqA; piece_on(rsq) != make_piece(c, ROOK); rsq++) {} + + else if (token >= 'A' && token <= 'H') + rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1)); + + else return; + + if (square_file(rsq) < square_file(ksq)) + set_castle(WHITE_OOO << c, ksq, rsq); + else + set_castle(WHITE_OO << c, ksq, rsq); } @@ -321,17 +304,17 @@ const string Position::to_fen() const { if (st->castleRights != CASTLES_NONE) { - if (can_castle_kingside(WHITE)) - fen += chess960 ? char(toupper(file_to_char(initialKRFile))) : 'K'; + if (can_castle(WHITE_OO)) + fen += chess960 ? char(toupper(file_to_char(square_file(castle_rook_square(WHITE_OO))))) : 'K'; - if (can_castle_queenside(WHITE)) - fen += chess960 ? char(toupper(file_to_char(initialQRFile))) : 'Q'; + if (can_castle(WHITE_OOO)) + fen += chess960 ? char(toupper(file_to_char(square_file(castle_rook_square(WHITE_OOO))))) : 'Q'; - if (can_castle_kingside(BLACK)) - fen += chess960 ? file_to_char(initialKRFile) : 'k'; + if (can_castle(BLACK_OO)) + fen += chess960 ? file_to_char(square_file(castle_rook_square(BLACK_OO))) : 'k'; - if (can_castle_queenside(BLACK)) - fen += chess960 ? file_to_char(initialQRFile) : 'q'; + if (can_castle(BLACK_OOO)) + fen += chess960 ? file_to_char(square_file(castle_rook_square(BLACK_OOO))) : 'q'; } else fen += '-'; @@ -1595,9 +1578,6 @@ void Position::clear() { castleRightsMask[sq] = ALL_CASTLES; sideToMove = WHITE; - initialKFile = FILE_E; - initialKRFile = FILE_H; - initialQRFile = FILE_A; } @@ -1671,16 +1651,13 @@ Key Position::compute_pawn_key() const { Key Position::compute_material_key() const { - int count; Key result = 0; for (Color c = WHITE; c <= BLACK; c++) for (PieceType pt = PAWN; pt <= QUEEN; pt++) - { - count = piece_count(c, pt); - for (int i = 0; i < count; i++) + for (int i = 0, cnt = piece_count(c, pt); i < cnt; i++) result ^= zobrist[c][pt][i]; - } + return result; } @@ -1819,21 +1796,14 @@ void Position::flip() { sideToMove = opposite_color(pos.side_to_move()); // Castling rights - if (pos.can_castle_kingside(WHITE)) set_castle_kingside(BLACK); - if (pos.can_castle_queenside(WHITE)) set_castle_queenside(BLACK); - if (pos.can_castle_kingside(BLACK)) set_castle_kingside(WHITE); - if (pos.can_castle_queenside(BLACK)) set_castle_queenside(WHITE); - - initialKFile = pos.initialKFile; - initialKRFile = pos.initialKRFile; - initialQRFile = pos.initialQRFile; - - 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(BLACK_OO, king_square(BLACK), flip_square(pos.castle_rook_square(WHITE_OO))); + if (pos.can_castle(WHITE_OOO)) + set_castle(BLACK_OOO, king_square(BLACK), flip_square(pos.castle_rook_square(WHITE_OOO))); + if (pos.can_castle(BLACK_OO)) + set_castle(WHITE_OO, king_square(WHITE), flip_square(pos.castle_rook_square(BLACK_OO))); + if (pos.can_castle(BLACK_OOO)) + set_castle(WHITE_OOO, king_square(WHITE), flip_square(pos.castle_rook_square(BLACK_OOO))); // En passant square if (pos.st->epSquare != SQ_NONE) @@ -1894,14 +1864,6 @@ bool Position::is_ok(int* failedStep) const { if (piece_on(king_square(BLACK)) != BK) return false; - // Castle files OK? - if (failedStep) (*failedStep)++; - if (!square_is_ok(make_square(initialKRFile, RANK_1))) - return false; - - if (!square_is_ok(make_square(initialQRFile, RANK_1))) - return false; - // Do both sides have exactly one king? if (failedStep) (*failedStep)++; if (debugKingCount) @@ -2015,24 +1977,17 @@ bool Position::is_ok(int* failedStep) const { if (failedStep) (*failedStep)++; if (debugCastleSquares) - { - for (Color c = WHITE; c <= BLACK; c++) + for (CastleRight f = WHITE_OO; f <= BLACK_OOO; f = CastleRight(f << 1)) { - if (can_castle_kingside(c) && piece_on(initial_kr_square(c)) != make_piece(c, ROOK)) - return false; + if (!can_castle(f)) + continue; + + Piece rook = (f & (WHITE_OO | WHITE_OOO) ? WR : BR); - if (can_castle_queenside(c) && piece_on(initial_qr_square(c)) != make_piece(c, ROOK)) + 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;