along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-////
-//// Includes
-////
-
#include <cassert>
#include <cstring>
#include <iomanip>
using std::string;
-////
-//// Local definitions
-////
-
namespace {
-
- enum Ambiguity {
- AMBIGUITY_NONE, AMBIGUITY_FILE, AMBIGUITY_RANK, AMBIGUITY_BOTH
- };
-
- Ambiguity move_ambiguity(const Position& pos, Move m);
const string time_string(int milliseconds);
const string score_string(Value v);
}
-////
-//// Functions
-////
-
/// 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 mode.
-const std::string move_to_uci(Move m, bool chess960) {
+const string move_to_uci(Move m, bool chess960) {
- std::string promotion;
Square from = move_from(m);
Square to = move_to(m);
+ string promotion;
if (m == MOVE_NONE)
return "(none)";
return from == SQ_E1 ? "e1c1" : "e8c8";
if (move_is_promotion(m))
- promotion = char(tolower(piece_type_to_char(move_promotion_piece(m))));
+ promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
return square_to_string(from) + square_to_string(to) + promotion;
}
/// move_from_uci() takes a position and a string representing a move in
-/// simple coordinate notation and returns an equivalent Move.
+/// simple coordinate notation and returns an equivalent Move if any.
+/// Moves are guaranteed to be legal.
-Move move_from_uci(const Position& pos, const std::string& str) {
+Move move_from_uci(const Position& pos, const string& str) {
- MoveStack mlist[MOVES_MAX];
+ MoveStack mlist[MAX_MOVES];
MoveStack* last = generate<MV_LEGAL>(pos, mlist);
for (MoveStack* cur = mlist; cur != last; cur++)
assert(pos.is_ok());
assert(move_is_ok(m));
- string san;
- Square from = move_from(m);
+ Bitboard attackers;
+ bool ambiguousMove, ambiguousFile, ambiguousRank;
+ Square sq, from = move_from(m);
Square to = move_to(m);
- PieceType pt = type_of_piece(pos.piece_on(from));
+ PieceType pt = pos.type_of_piece_on(from);
+ string san;
if (m == MOVE_NONE)
return "(none)";
{
if (pt != PAWN)
{
- san += piece_type_to_char(pt);
-
- switch (move_ambiguity(pos, m)) {
- case AMBIGUITY_NONE:
- break;
- case AMBIGUITY_FILE:
- san += file_to_char(square_file(from));
- break;
- case AMBIGUITY_RANK:
- san += rank_to_char(square_rank(from));
- break;
- case AMBIGUITY_BOTH:
- san += square_to_string(from);
- break;
- default:
- assert(false);
+ san = piece_type_to_char(pt);
+
+ // 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(pt, pos.side_to_move());
+ clear_bit(&attackers, from);
+ ambiguousMove = ambiguousFile = ambiguousRank = false;
+
+ while (attackers)
+ {
+ sq = pop_1st_bit(&attackers);
+
+ if (square_file(sq) == square_file(from))
+ ambiguousFile = true;
+
+ if (square_rank(sq) == square_rank(from))
+ ambiguousRank = true;
+
+ ambiguousMove = true;
+ }
+
+ if (ambiguousMove)
+ {
+ if (!ambiguousFile)
+ san += file_to_char(square_file(from));
+ else if (!ambiguousRank)
+ san += rank_to_char(square_rank(from));
+ else
+ san += square_to_string(from);
}
}
san += 'x';
}
+
san += square_to_string(to);
if (move_is_promotion(m))
{
san += '=';
- san += piece_type_to_char(move_promotion_piece(m));
+ san += piece_type_to_char(promotion_piece_type(m));
}
}
- // The move gives check ? We don't use pos.move_is_check() here
- // because we need to test for mate after the move is done.
+ // The move gives check? We don't use pos.move_gives_check() here
+ // because we need to test for a mate after the move is done.
StateInfo st;
pos.do_move(m, st);
- if (pos.is_check())
+ if (pos.in_check())
san += pos.is_mate() ? "#" : "+";
pos.undo_move(m);
StateInfo state[PLY_MAX_PLUS_2], *st = state;
Move* m = pv;
- std::stringstream s;
string san;
+ std::stringstream s;
size_t length = 0;
// First print depth, score, time and searched nodes...
if (pos.nodes_searched() < M)
s << std::setw(8) << pos.nodes_searched() / 1 << " ";
else if (pos.nodes_searched() < K * M)
- s << std::setw(7) << pos.nodes_searched() / K << " K ";
+ s << std::setw(7) << pos.nodes_searched() / K << "K ";
else
- s << std::setw(7) << pos.nodes_searched() / M << " M ";
+ s << std::setw(7) << pos.nodes_searched() / M << "M ";
// ...then print the full PV line in short algebraic notation
while (*m != MOVE_NONE)
namespace {
- Ambiguity move_ambiguity(const Position& pos, Move m) {
-
- MoveStack mlist[MOVES_MAX];
- Piece pc = pos.piece_on(move_from(m));
- int f = 0, r = 0;
-
- MoveStack* last = generate<MV_LEGAL>(pos, mlist);
-
- // Collect all legal moves of piece 'pc' with destination 'to'
- for (MoveStack* cur = mlist; cur != last; cur++)
- {
- if ( move_to(cur->move) == move_to(m)
- && pos.piece_on(move_from(cur->move)) == pc)
- {
- if (square_file(move_from(cur->move)) == square_file(move_from(m)))
- f++;
-
- if (square_rank(move_from(cur->move)) == square_rank(move_from(m)))
- r++;
- }
- }
-
- assert(f > 0 && r > 0);
-
- return f == 1 ? (r == 1 ? AMBIGUITY_NONE : AMBIGUITY_FILE)
- : (r == 1 ? AMBIGUITY_RANK : AMBIGUITY_BOTH);
- }
-
-
const string time_string(int millisecs) {
const int MSecMinute = 1000 * 60;
projects / stockfish / blobdiff