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

Micro-optimize move_to_san()

Browse source 
Calculate the attacks only for the piece to disambiguate,
not for all.

Also some reformatting while there.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2012-06-24 12:08:07 +01:00
parent dc7fd868f4
commit 628808a113
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/notation.cpp
View file

@ -25,6 +25,8 @@
using std::string;
static const char* PieceToChar = " PNBRQK pnbrqk";
/// move_to_uci() converts a move to a string in coordinate notation
/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print
/// in the e1g1 notation in normal chess mode, and in e1h1 notation in chess960
@ -47,7 +49,7 @@ const string move_to_uci(Move m, bool chess960) {
string move = square_to_string(from) + square_to_string(to);
if (type_of(m) == PROMOTION)
move += char(tolower(piece_type_to_char(promotion_type(m))));
move += PieceToChar[promotion_type(m) + 7]; // Lower case
return move;
}
@ -85,24 +87,25 @@ const string move_to_san(Position& pos, Move m) {
Bitboard attackers;
bool ambiguousMove, ambiguousFile, ambiguousRank;
string san;
Color us = pos.side_to_move();
Square from = from_sq(m);
Square to = to_sq(m);
PieceType pt = type_of(pos.piece_on(from));
Piece pc = pos.piece_on(from);
if (type_of(m) == CASTLE)
san = to > from ? "O-O" : "O-O-O";
else
{
if (pt != PAWN)
if (type_of(pc) != PAWN)
{
san = piece_type_to_char(pt);
san = PieceToChar[pc];
// Disambiguation if we have more then one piece with destination 'to'
// note that for pawns is not needed because starting file is explicit.
attackers = pos.attackers_to(to) & pos.pieces(pos.side_to_move(), pt);
attackers ^= from;
ambiguousMove = ambiguousFile = ambiguousRank = false;
attackers = (pos.attacks_from(pc, to) & pos.pieces(us)) ^ from;
while (attackers)
{
Square sq = pop_1st_bit(&attackers);
@ -128,19 +131,16 @@ const string move_to_san(Position& pos, Move m) {
san += square_to_string(from);
}
}
else if (pos.is_capture(m))
san = file_to_char(file_of(from));
if (pos.is_capture(m))
{
if (pt == PAWN)
san += file_to_char(file_of(from));
san += 'x';
}
san += square_to_string(to);
if (type_of(m) == PROMOTION)
san += string("=") + piece_type_to_char(promotion_type(m));
san += string("=") + PieceToChar[promotion_type(m)];
}
if (pos.move_gives_check(m, CheckInfo(pos)))

4
src/types.h
View file

@ -415,10 +415,6 @@ inline int square_distance(Square s1, Square s2) {
return SquareDistance[s1][s2];
}
inline char piece_type_to_char(PieceType pt) {
return " PNBRQK"[pt];
}
inline char file_to_char(File f) {
return char(f - FILE_A + int('a'));
}