X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=19812ab7d8865b094c9d01f90c90dc69fea27a48;hp=1942abb0823c4add37a29bc8764319f4e4ec5578;hb=02882dfe81eae37ce09ce9af95864cf9fad49bbe;hpb=839088205edd88eee9852c21442424cc66941ccb diff --git a/src/position.cpp b/src/position.cpp index 1942abb0..19812ab7 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -22,9 +22,11 @@ //// Includes //// +#include #include #include #include +#include #include #include @@ -42,6 +44,31 @@ using std::string; using std::cout; using std::endl; +static inline bool isZero(char c) { return c == '0'; } + +struct PieceLetters : std::map { + + PieceLetters() { + + operator[]('K') = WK; operator[]('k') = BK; + operator[]('Q') = WQ; operator[]('q') = BQ; + operator[]('R') = WR; operator[]('r') = BR; + operator[]('B') = WB; operator[]('b') = BB; + operator[]('N') = WN; operator[]('n') = BN; + operator[]('P') = WP; operator[]('p') = BP; + } + + char from_piece(Piece p) const { + + map::const_iterator it; + for (it = begin(); it != end(); ++it) + if (it->second == p) + return it->first; + + assert(false); + return 0; + } +}; //// //// Variables @@ -56,6 +83,7 @@ Key Position::zobExclusion; Score Position::PieceSquareTable[16][64]; static bool RequestPending = false; +static PieceLetters pieceLetters; /// Constructors @@ -142,15 +170,10 @@ 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 const string pieceLetters = "KQRBNPkqrbnp"; - static const Piece pieces[] = { WK, WQ, WR, WB, WN, WP, BK, BQ, BR, BB, BN, BP }; - + char token; + std::istringstream ss(fen); Rank rank = RANK_8; File file = FILE_A; - size_t idx; - - std::istringstream ss(fen); - char token; clear(); @@ -159,8 +182,7 @@ void Position::from_fen(const string& fen) { { if (isdigit(token)) { - // Skip the given number of files - file += token - '1' + 1; + file += token - '0'; // Skip the given number of files continue; } else if (token == '/') @@ -170,11 +192,10 @@ void Position::from_fen(const string& fen) { continue; } - idx = pieceLetters.find(token); - if (idx == string::npos) + if (pieceLetters.find(token) == pieceLetters.end()) goto incorrect_fen; - put_piece(pieces[idx], make_square(file, rank)); + put_piece(pieceLetters[token], make_square(file, rank)); file++; } @@ -205,15 +226,15 @@ void Position::from_fen(const string& fen) { Square fenEpSquare = make_square(file_from_char(col), rank_from_char(row)); Color them = opposite_color(sideToMove); - if (attacks_from(fenEpSquare, them) & this->pieces(PAWN, sideToMove)) + if (attacks_from(fenEpSquare, them) & pieces(PAWN, sideToMove)) st->epSquare = fenEpSquare; } // 5-6. Halfmove clock and fullmove number are not parsed // 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(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; @@ -291,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 "); + + fen.erase(std::remove_if(fen.begin(), fen.end(), isZero), fen.end()); + fen.erase(--fen.end()); + 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 += '-'; + 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; } @@ -393,8 +406,8 @@ void Position::print(Move m) const { cout << '|' << endl; } cout << "+---+---+---+---+---+---+---+---+" << endl - << "Fen is: " << to_fen() << endl - << "Key is: " << st->key << endl; + << "Fen is: " << to_fen() << endl + << "Key is: " << st->key << endl; RequestPending = false; }