X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fnotation.cpp;h=d017c0790cc801b42842b949eb9c2c85d210e788;hp=eb3c46a0244904e63588ef821b1e5714ffd5d468;hb=13d1f0ae4301b86c610a58332c3c19d9101704da;hpb=520e680278964931abcaf3e1ab89b24423777999 diff --git a/src/notation.cpp b/src/notation.cpp index eb3c46a0..d017c079 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-2013 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 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "movegen.h" #include "notation.h" @@ -28,7 +28,7 @@ using namespace std; -static const char* PieceToChar = " 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 @@ -43,7 +43,7 @@ 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(PawnValueMidgame); + s << "cp " << v * 100 / int(PawnValueMg); else s << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2; @@ -75,7 +75,7 @@ const string move_to_uci(Move m, bool chess960) { string move = square_to_string(from) + square_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; } @@ -89,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; } @@ -108,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) san = to > from ? "O-O" : "O-O-O"; else { - if (type_of(pc) != PAWN) + if (pt != PAWN) { - san = PieceToChar[pc]; + 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; + // Disambiguation 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)) ^ 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) + if (!(others & file_bb(from))) san += file_to_char(file_of(from)); - else if (!ambiguousRank) + else if (!(others & rank_bb(from))) san += rank_to_char(rank_of(from)); else san += square_to_string(from); } } - else if (pos.is_capture(m)) + else if (pos.capture(m)) san = file_to_char(file_of(from)); - if (pos.is_capture(m)) + if (pos.capture(m)) san += 'x'; san += square_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); @@ -185,14 +177,14 @@ const string move_to_san(Position& pos, Move m) { /// appended to the search log file. It uses the two helpers below to pretty /// format time and score respectively. -static string time_to_string(int millisecs) { +static string time_to_string(int64_t msecs) { const int MSecMinute = 1000 * 60; const int MSecHour = 1000 * 60 * 60; - int hours = millisecs / MSecHour; - int minutes = (millisecs % MSecHour) / MSecMinute; - int seconds = ((millisecs % MSecHour) % MSecMinute) / 1000; + int64_t hours = msecs / MSecHour; + int64_t minutes = (msecs % MSecHour) / MSecMinute; + int64_t seconds = ((msecs % MSecHour) % MSecMinute) / 1000; stringstream s; @@ -215,17 +207,17 @@ static string score_to_string(Value v) { s << "-#" << (VALUE_MATE + v) / 2; else - s << setprecision(2) << fixed << showpos << float(v) / PawnValueMidgame; + s << setprecision(2) << fixed << showpos << double(v) / PawnValueMg; return s.str(); } -string pretty_pv(Position& pos, int depth, Value value, int time, Move pv[]) { +string pretty_pv(Position& pos, int depth, Value value, int64_t msecs, Move pv[]) { const int64_t K = 1000; const int64_t M = 1000000; - StateInfo state[MAX_PLY_PLUS_2], *st = state; + std::stack st; Move* m = pv; string san, padding; size_t length; @@ -233,7 +225,7 @@ string pretty_pv(Position& pos, int depth, Value value, int time, Move pv[]) { s << setw(2) << depth << setw(8) << score_to_string(value) - << setw(8) << time_to_string(time); + << setw(8) << time_to_string(msecs); if (pos.nodes_searched() < M) s << setw(8) << pos.nodes_searched() / 1 << " "; @@ -260,7 +252,8 @@ string pretty_pv(Position& pos, int depth, Value value, int time, Move pv[]) { s << san << ' '; length += san.length() + 1; - pos.do_move(*m++, *st++); + st.push(StateInfo()); + pos.do_move(*m++, st.top()); } while (m != pv)