X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fnotation.cpp;h=d167c2ff446208c5b0b534a2b2c2971518bbd9b1;hp=69a44d95bf8b8de90186fd423547bb4b577e750c;hb=2469daebb1b2ec2ca1653754c35327c16838938e;hpb=628808a11382a3acd8501199ab58eee0e1e1e3bc diff --git a/src/notation.cpp b/src/notation.cpp index 69a44d95..d167c2ff 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,21 +18,53 @@ */ #include -#include +#include #include "movegen.h" #include "position.h" +#include "uci.h" -using std::string; +using namespace std; -static const char* PieceToChar = " PNBRQK pnbrqk"; +static const char* PieceToChar[COLOR_NB] = { " PNBRQK", " pnbrqk" }; -/// move_to_uci() converts a move to a string in coordinate notation + +/// 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 UCI::format_value(Value v, Value alpha, Value beta) { + + stringstream ss; + + if (abs(v) < VALUE_MATE_IN_MAX_PLY) + ss << "cp " << v * 100 / PawnValueEg; + else + ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2; + + ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : ""); + + return ss.str(); +} + + +/// format_square() converts a Square to a string (g1, a7, etc.) + +std::string UCI::format_square(Square s) { + char ch[] = { 'a' + file_of(s), '1' + rank_of(s), 0 }; + return ch; +} + + +/// format_move() 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) { +string UCI::format_move(Move m, bool chess960) { Square from = from_sq(m); Square to = to_sq(m); @@ -43,113 +75,29 @@ 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 = format_square(from) + format_square(to); if (type_of(m) == PROMOTION) - move += PieceToChar[promotion_type(m) + 7]; // Lower case + move += PieceToChar[BLACK][promotion_type(m)]; // Lower case return move; } -/// move_from_uci() takes a position and a string representing a move in +/// to_move() takes a position and a string representing a move in /// simple coordinate notation and returns an equivalent legal Move if any. -Move move_from_uci(const Position& pos, string& str) { +Move UCI::to_move(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 == format_move(*it, pos.is_chess960())) + return *it; return MOVE_NONE; } - - -/// move_to_san() takes a position and a legal Move as input and returns its -/// short algebraic notation representation. - -const string move_to_san(Position& pos, Move m) { - - if (m == MOVE_NONE) - return "(none)"; - - if (m == MOVE_NULL) - return "(null)"; - - assert(pos.move_is_legal(m)); - - Bitboard attackers; - bool ambiguousMove, ambiguousFile, ambiguousRank; - string san; - Color us = pos.side_to_move(); - Square from = from_sq(m); - Square to = to_sq(m); - Piece pc = pos.piece_on(from); - - if (type_of(m) == CASTLE) - san = to > from ? "O-O" : "O-O-O"; - else - { - if (type_of(pc) != 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; - - attackers = (pos.attacks_from(pc, to) & pos.pieces(us)) ^ from; - - while (attackers) - { - 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; - } - - if (ambiguousMove) - { - if (!ambiguousFile) - san += file_to_char(file_of(from)); - - else if (!ambiguousRank) - san += rank_to_char(rank_of(from)); - - else - san += square_to_string(from); - } - } - else if (pos.is_capture(m)) - san = file_to_char(file_of(from)); - - if (pos.is_capture(m)) - san += 'x'; - - san += square_to_string(to); - - if (type_of(m) == PROMOTION) - san += string("=") + PieceToChar[promotion_type(m)]; - } - - if (pos.move_gives_check(m, CheckInfo(pos))) - { - StateInfo st; - pos.do_move(m, st); - san += MoveList(pos).size() ? "+" : "#"; - pos.undo_move(m); - } - - return san; -}