kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00
Code Issues Releases Wiki Activity

Small improvment to Position::fen()

Browse source 
No functional change.
This commit is contained in:
Marco Costalba 2013-12-03 10:09:17 +01:00
parent c7e7d9217b
commit e6c9ce6358
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/position.cpp
View file

@ -211,7 +211,7 @@ void Position::set(const string& fenStr, bool isChess960, Thread* th) {
*/ */
char col, row, token; char col, row, token;
size_t p; size_t idx;
Square sq = SQ_A8; Square sq = SQ_A8;
std::istringstream ss(fenStr); std::istringstream ss(fenStr);
@ -227,9 +227,9 @@ void Position::set(const string& fenStr, bool isChess960, Thread* th) {
else if (token == '/') else if (token == '/')
sq -= Square(16); sq -= Square(16);
else if ((p = PieceToChar.find(token)) != string::npos) else if ((idx = PieceToChar.find(token)) != string::npos)
{ {
put_piece(sq, color_of(Piece(p)), type_of(Piece(p))); put_piece(sq, color_of(Piece(idx)), type_of(Piece(idx)));
++sq; ++sq;
} }
} }
@ -329,25 +329,21 @@ void Position::set_castling_flag(Color c, Square rfrom) {
const string Position::fen() const { const string Position::fen() const {
int emptyCnt;
std::ostringstream ss; std::ostringstream ss;
for (Rank rank = RANK_8; rank >= RANK_1; --rank) for (Rank rank = RANK_8; rank >= RANK_1; --rank)
{ {
for (File file = FILE_A; file <= FILE_H; ++file) for (File file = FILE_A; file <= FILE_H; ++file)
{ {
Square sq = file | rank; for (emptyCnt = 0; file <= FILE_H && empty(file | rank); ++file)
++emptyCnt;
if (empty(sq))
{
int emptyCnt = 1;
for ( ; file < FILE_H && empty(++sq); ++file)
++emptyCnt;
if (emptyCnt)
ss << emptyCnt; ss << emptyCnt;
}
else if (file <= FILE_H)
ss << PieceToChar[piece_on(sq)]; ss << PieceToChar[piece_on(file | rank)];
} }
if (rank > RANK_1) if (rank > RANK_1)
@ -368,11 +364,11 @@ const string Position::fen() const {
if (can_castle(BLACK_OOO)) if (can_castle(BLACK_OOO))
ss << (chess960 ? file_to_char(file_of(castling_rook_square(BLACK, QUEEN_SIDE)), true) : 'q'); ss << (chess960 ? file_to_char(file_of(castling_rook_square(BLACK, QUEEN_SIDE)), true) : 'q');
if (st->castlingFlags == NO_CASTLING) if (!can_castle(WHITE) && !can_castle(BLACK))
ss << '-'; ss << '-';
ss << (ep_square() == SQ_NONE ? " - " : " " + square_to_string(ep_square()) + " ") ss << (ep_square() == SQ_NONE ? " - " : " " + square_to_string(ep_square()) + " ")
<< st->rule50 << " " << 1 + (gamePly - int(sideToMove == BLACK)) / 2; << st->rule50 << " " << 1 + (gamePly - int(sideToMove == BLACK)) / 2;
return ss.str(); return ss.str();
} }

2
src/position.h
View file

@ -81,7 +81,7 @@ public:
static void init(); static void init();
// Text input/output // Text input/output
void set(const std::string& fen, bool isChess960, Thread* th); void set(const std::string& fenStr, bool isChess960, Thread* th);
const std::string fen() const; const std::string fen() const;
const std::string pretty(Move m = MOVE_NONE) const; const std::string pretty(Move m = MOVE_NONE) const;