/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/// 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. Internally castle moves are always coded as "king captures rook".
+/// mode. Internally castling moves are always encoded as "king captures rook".
const string move_to_uci(Move m, bool chess960) {
if (m == MOVE_NULL)
return "0000";
- if (type_of(m) == CASTLE && !chess960)
+ if (type_of(m) == CASTLING && !chess960)
to = (to > from ? FILE_G : FILE_C) | rank_of(from);
string move = square_to_string(from) + square_to_string(to);
Piece pc = pos.piece_on(from);
PieceType pt = type_of(pc);
- if (type_of(m) == CASTLE)
+ if (type_of(m) == CASTLING)
san = to > from ? "O-O" : "O-O-O";
else
{
{
san = PieceToChar[WHITE][pt]; // Upper case
- // Disambiguation if we have more then one piece of type 'pt' that can
- // reach 'to' with a legal move.
+ // A disambiguation occurs if we have more then one piece of type 'pt'
+ // that can reach 'to' with a legal move.
others = b = (pos.attacks_from(pc, to) & pos.pieces(us, pt)) ^ from;
while (b)
{
Move move = make_move(pop_lsb(&b), to);
- if (!pos.legal(move, pos.pinned_pieces()))
+ if (!pos.legal(move, pos.pinned_pieces(pos.side_to_move())))
others ^= from_sq(move);
}
/// pretty_pv() formats human-readable search information, typically to be
/// appended to the search log file. It uses the two helpers below to pretty
-/// format time and score respectively.
+/// format the time and score respectively.
static string time_to_string(int64_t msecs) {
return s.str();
}
-string pretty_pv(Position& pos, int depth, Value value, int64_t msecs, Move pv[]) {
+string pretty_pv(Position& pos, int depth, Value value, uint64_t msecs, Move pv[]) {
- const int64_t K = 1000;
- const int64_t M = 1000000;
+ const uint64_t K = 1000;
+ const uint64_t M = 1000000;
std::stack<StateInfo> st;
Move* m = pv;