/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 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
#include <cassert>
#include <iomanip>
#include <sstream>
-#include <string>
+#include <stack>
#include "movegen.h"
#include "notation.h"
using namespace std;
-static const char* PieceToChar[COLOR_NB] = { "PNBRQK", "pnbrqk" };
+static const char* PieceToChar[COLOR_NB] = { " PNBRQK", " pnbrqk" };
/// score_to_uci() converts a value to a string suitable for use with the UCI
/// 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)
- to = (to > from ? FILE_G : FILE_C) | rank_of(from);
+ if (type_of(m) == CASTLING && !chess960)
+ to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
- string move = square_to_string(from) + square_to_string(to);
+ string move = to_string(from) + to_string(to);
if (type_of(m) == PROMOTION)
move += PieceToChar[BLACK][promotion_type(m)]; // Lower case
if (str.length() == 5) // Junior could send promotion piece in uppercase
str[4] = char(tolower(str[4]));
- for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
- if (str == move_to_uci(ml.move(), pos.is_chess960()))
- return ml.move();
+ for (MoveList<LEGAL> it(pos); *it; ++it)
+ if (str == move_to_uci(*it, pos.is_chess960()))
+ return *it;
return MOVE_NONE;
}
if (m == MOVE_NULL)
return "(null)";
- assert(pos.move_is_legal(m));
+ assert(MoveList<LEGAL>(pos).contains(m));
- Bitboard attackers;
- bool ambiguousMove, ambiguousFile, ambiguousRank;
+ Bitboard others, b;
string san;
Color us = pos.side_to_move();
Square from = from_sq(m);
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 with destination 'to'
- // note that for pawns is not needed because starting file is explicit.
- ambiguousMove = ambiguousFile = ambiguousRank = false;
+ // 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;
- attackers = (pos.attacks_from(pc, to) & pos.pieces(us, pt)) ^ from;
-
- while (attackers)
+ while (b)
{
- Square sq = pop_lsb(&attackers);
-
- // Pinned pieces are not included in the possible sub-set
- if (!pos.pl_move_is_legal(make_move(sq, to), pos.pinned_pieces()))
- continue;
-
- ambiguousFile |= file_of(sq) == file_of(from);
- ambiguousRank |= rank_of(sq) == rank_of(from);
- ambiguousMove = true;
+ Move move = make_move(pop_lsb(&b), to);
+ if (!pos.legal(move, pos.pinned_pieces(pos.side_to_move())))
+ others ^= from_sq(move);
}
- if (ambiguousMove)
+ if (others)
{
- if (!ambiguousFile)
- san += file_to_char(file_of(from));
+ if (!(others & file_bb(from)))
+ san += to_char(file_of(from));
- else if (!ambiguousRank)
- san += rank_to_char(rank_of(from));
+ else if (!(others & rank_bb(from)))
+ san += to_char(rank_of(from));
else
- san += square_to_string(from);
+ san += to_string(from);
}
}
- else if (pos.is_capture(m))
- san = file_to_char(file_of(from));
+ else if (pos.capture(m))
+ san = to_char(file_of(from));
- if (pos.is_capture(m))
+ if (pos.capture(m))
san += 'x';
- san += square_to_string(to);
+ san += to_string(to);
if (type_of(m) == PROMOTION)
san += string("=") + PieceToChar[WHITE][promotion_type(m)];
}
- if (pos.move_gives_check(m, CheckInfo(pos)))
+ if (pos.gives_check(m, CheckInfo(pos)))
{
StateInfo st;
pos.do_move(m, st);
/// 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) {
s << "-#" << (VALUE_MATE + v) / 2;
else
- s << setprecision(2) << fixed << showpos << float(v) / PawnValueMg;
+ s << setprecision(2) << fixed << showpos << double(v) / PawnValueMg;
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;
- StateInfo state[MAX_PLY_PLUS_2], *st = state;
+ std::stack<StateInfo> st;
Move* m = pv;
string san, padding;
size_t length;
s << san << ' ';
length += san.length() + 1;
- pos.do_move(*m++, *st++);
+ st.push(StateInfo());
+ pos.do_move(*m++, st.top());
}
while (m != pv)
projects / stockfish / blobdiff