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

Better document move_to_san()

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-06-10 08:49:12 +02:00
parent a21a110188
commit bc4f3155ae
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/bitboard.cpp
View file

@ -79,7 +79,7 @@ void print_bitboard(Bitboard b) {
{ {
std::cout << "+---+---+---+---+---+---+---+---+" << '\n'; std::cout << "+---+---+---+---+---+---+---+---+" << '\n';
for (File f = FILE_A; f <= FILE_H; f++) for (File f = FILE_A; f <= FILE_H; f++)
std::cout << "| " << (bit_is_set(b, make_square(f, r)) ? 'X' : ' ') << ' '; std::cout << "| " << (bit_is_set(b, make_square(f, r)) ? "X " : " ");
std::cout << "|\n"; std::cout << "|\n";
} }
@ -332,9 +332,9 @@ namespace {
attack[s] = &attTable[offset]; attack[s] = &attTable[offset];
mask[s] = sliding_attacks(s, EmptyBoardBB, delta, excluded); mask[s] = sliding_attacks(s, EmptyBoardBB, delta, excluded);
shift[s] = (CpuIs64Bit ? 64 : 32) - count_1s<CNT64>(mask[s]); shift[s] = (CpuIs64Bit ? 64 : 32) - count_1s<CNT32_MAX15>(mask[s]);
maxKey = 1 << count_1s<CNT32>(mask[s]); maxKey = 1 << count_1s<CNT32_MAX15>(mask[s]);
offset += maxKey; offset += maxKey;
booster = MagicBoosters[CpuIs64Bit][square_rank(s)]; booster = MagicBoosters[CpuIs64Bit][square_rank(s)];

38
src/move.cpp
View file

@ -91,8 +91,9 @@ const string move_to_san(Position& pos, Move m) {
assert(pos.is_ok()); assert(pos.is_ok());
assert(move_is_ok(m)); assert(move_is_ok(m));
MoveStack mlist[MAX_MOVES]; Bitboard attackers;
Square from = move_from(m); bool ambiguousMove, ambiguousFile, ambiguousRank;
Square sq, from = move_from(m);
Square to = move_to(m); Square to = move_to(m);
PieceType pt = pos.type_of_piece_on(from); PieceType pt = pos.type_of_piece_on(from);
string san; string san;
@ -113,31 +114,30 @@ const string move_to_san(Position& pos, Move m) {
{ {
san = piece_type_to_char(pt); san = piece_type_to_char(pt);
// Collect all legal moves of piece type 'pt' with destination 'to' // Disambiguation if we have more then one piece with destination 'to'
MoveStack* last = generate<MV_LEGAL>(pos, mlist); // note that for pawns is not needed because starting file is explicit.
int f = 0, r = 0, cnt = 0; attackers = pos.attackers_to(to) & pos.pieces(pt, pos.side_to_move());
clear_bit(&attackers, from);
ambiguousMove = ambiguousFile = ambiguousRank = false;
for (MoveStack* cur = mlist; cur != last; cur++) while (attackers)
if ( move_to(cur->move) == to
&& pos.type_of_piece_on(move_from(cur->move)) == pt)
{ {
cnt++; sq = pop_1st_bit(&attackers);
if (square_file(move_from(cur->move)) == square_file(from)) if (square_file(sq) == square_file(from))
f++; ambiguousFile = true;
if (square_rank(move_from(cur->move)) == square_rank(from)) if (square_rank(sq) == square_rank(from))
r++; ambiguousRank = true;
ambiguousMove = true;
} }
assert(cnt > 0 && f > 0 && r > 0); if (ambiguousMove)
// Disambiguation if we have more then one piece with destination 'to'
if (cnt > 1)
{ {
if (f == 1) if (!ambiguousFile)
san += file_to_char(square_file(from)); san += file_to_char(square_file(from));
else if (r == 1) else if (!ambiguousRank)
san += rank_to_char(square_rank(from)); san += rank_to_char(square_rank(from));
else else
san += square_to_string(from); san += square_to_string(from);