X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fnotation.cpp;h=3f2499edccbdc7277c1ab21b8c87d7cb009886ad;hp=69a44d95bf8b8de90186fd423547bb4b577e750c;hb=698b645e10388366ca0400bc05c21af98b7703b2;hpb=628808a11382a3acd8501199ab58eee0e1e1e3bc diff --git a/src/notation.cpp b/src/notation.cpp index 69a44d95..3f2499ed 100644 --- a/src/notation.cpp +++ b/src/notation.cpp @@ -1,7 +1,7 @@ /* 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 @@ -18,19 +18,45 @@ */ #include -#include +#include +#include +#include #include "movegen.h" +#include "notation.h" #include "position.h" -using std::string; +using namespace std; + +static const char* PieceToChar[COLOR_NB] = { " PNBRQK", " pnbrqk" }; + + +/// score_to_uci() converts a value to a string suitable for use with the UCI +/// protocol specifications: +/// +/// cp The score from the engine's point of view in centipawns. +/// mate Mate in y moves, not plies. If the engine is getting mated +/// use negative values for y. + +string score_to_uci(Value v, Value alpha, Value beta) { + + stringstream s; + + if (abs(v) < VALUE_MATE_IN_MAX_PLY) + s << "cp " << v * 100 / int(PawnValueMg); + else + s << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2; + + s << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : ""); + + return s.str(); +} -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 -/// 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) { @@ -43,13 +69,13 @@ 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[promotion_type(m) + 7]; // Lower case + move += PieceToChar[BLACK][promotion_type(m)]; // Lower case return move; } @@ -63,9 +89,9 @@ Move move_from_uci(const Position& pos, string& str) { if (str.length() == 5) // Junior could send promotion piece in uppercase str[4] = char(tolower(str[4])); - for (MoveList ml(pos); !ml.end(); ++ml) - if (str == move_to_uci(ml.move(), pos.is_chess960())) - return ml.move(); + for (MoveList it(pos); *it; ++it) + if (str == move_to_uci(*it, pos.is_chess960())) + return *it; return MOVE_NONE; } @@ -82,68 +108,60 @@ const string move_to_san(Position& pos, Move m) { if (m == MOVE_NULL) return "(null)"; - assert(pos.move_is_legal(m)); + assert(MoveList(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); Square to = to_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 { - if (type_of(pc) != PAWN) + if (pt != PAWN) { - 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. - ambiguousMove = ambiguousFile = ambiguousRank = false; + san = PieceToChar[WHITE][pt]; // Upper case - attackers = (pos.attacks_from(pc, to) & pos.pieces(us)) ^ from; + // 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 (attackers) + while (b) { - Square sq = pop_1st_bit(&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; + Square sq = pop_lsb(&b); + if (!pos.legal(make_move(sq, to), pos.pinned_pieces(us))) + others ^= sq; } - if (ambiguousMove) - { - if (!ambiguousFile) - san += file_to_char(file_of(from)); + if (!others) + { /* disambiguation is not needed */ } - else if (!ambiguousRank) - san += rank_to_char(rank_of(from)); + else if (!(others & file_bb(from))) + san += to_char(file_of(from)); - else - san += square_to_string(from); - } + else if (!(others & rank_bb(from))) + san += to_char(rank_of(from)); + + else + 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[promotion_type(m)]; + 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); @@ -153,3 +171,93 @@ const string move_to_san(Position& pos, Move m) { return san; } + + +/// 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 the time and score respectively. + +static string time_to_string(int64_t msecs) { + + const int MSecMinute = 1000 * 60; + const int MSecHour = 1000 * 60 * 60; + + int64_t hours = msecs / MSecHour; + int64_t minutes = (msecs % MSecHour) / MSecMinute; + int64_t seconds = ((msecs % MSecHour) % MSecMinute) / 1000; + + stringstream s; + + if (hours) + s << hours << ':'; + + s << setfill('0') << setw(2) << minutes << ':' << setw(2) << seconds; + + return s.str(); +} + +static string score_to_string(Value v) { + + stringstream s; + + if (v >= VALUE_MATE_IN_MAX_PLY) + s << "#" << (VALUE_MATE - v + 1) / 2; + + else if (v <= VALUE_MATED_IN_MAX_PLY) + s << "-#" << (VALUE_MATE + v) / 2; + + else + s << setprecision(2) << fixed << showpos << double(v) / PawnValueMg; + + return s.str(); +} + +string pretty_pv(Position& pos, int depth, Value value, uint64_t msecs, Move pv[]) { + + const uint64_t K = 1000; + const uint64_t M = 1000000; + + std::stack st; + Move* m = pv; + string san, padding; + size_t length; + stringstream s; + + s << setw(2) << depth + << setw(8) << score_to_string(value) + << setw(8) << time_to_string(msecs); + + if (pos.nodes_searched() < M) + s << setw(8) << pos.nodes_searched() / 1 << " "; + + else if (pos.nodes_searched() < K * M) + s << setw(7) << pos.nodes_searched() / K << "K "; + + else + s << setw(7) << pos.nodes_searched() / M << "M "; + + padding = string(s.str().length(), ' '); + length = padding.length(); + + while (*m != MOVE_NONE) + { + san = move_to_san(pos, *m); + + if (length + san.length() > 80) + { + s << "\n" + padding; + length = padding.length(); + } + + s << san << ' '; + length += san.length() + 1; + + st.push(StateInfo()); + pos.do_move(*m++, st.top()); + } + + while (m != pv) + pos.undo_move(*--m); + + return s.str(); +}