X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsan.cpp;h=ef22626f950c51e65c8033c42f89d6a94f1642dc;hb=61c03b9d22de0c1ccf0c60af4e223775d4b3f7cc;hp=ae0364e83db1a35a89ae5df6924261a3bb6d0671;hpb=4aeffc8c9a7ba870702974f62d1d3553ed227c00;p=stockfish diff --git a/src/san.cpp b/src/san.cpp index ae0364e8..ef22626f 100644 --- a/src/san.cpp +++ b/src/san.cpp @@ -85,7 +85,7 @@ const string move_to_san(Position& pos, Move m) { { if (pt != PAWN) { - san += piece_type_to_char(pt, true); + san += piece_type_to_char(pt); switch (move_ambiguity(pos, m)) { case AMBIGUITY_NONE: @@ -113,7 +113,7 @@ const string move_to_san(Position& pos, Move m) { if (move_is_promotion(m)) { san += "="; - san += piece_type_to_char(move_promotion_piece(m), true); + san += piece_type_to_char(move_promotion_piece(m)); } } @@ -322,11 +322,11 @@ const string line_to_san(const Position& pos, Move line[], int startColumn, bool /// It is used to write search information to the log file (which is created /// when the UCI parameter "Use Search Log" is "true"). -const string pretty_pv(const Position& pos, int time, int depth, uint64_t nodes, +const string pretty_pv(const Position& pos, int time, int depth, Value score, ValueType type, Move pv[]) { - const uint64_t K = 1000; - const uint64_t M = 1000000; + const int64_t K = 1000; + const int64_t M = 1000000; std::stringstream s; @@ -341,12 +341,12 @@ const string pretty_pv(const Position& pos, int time, int depth, uint64_t nodes, s << std::setw(8) << time_string(time) << " "; // Nodes - if (nodes < M) - s << std::setw(8) << nodes / 1 << " "; - else if (nodes < K * M) - s << std::setw(7) << nodes / K << "K "; + if (pos.nodes_searched() < M) + s << std::setw(8) << pos.nodes_searched() / 1 << " "; + else if (pos.nodes_searched() < K * M) + s << std::setw(7) << pos.nodes_searched() / K << "K "; else - s << std::setw(7) << nodes / M << "M "; + s << std::setw(7) << pos.nodes_searched() / M << "M "; // PV s << line_to_san(pos, pv, 30, true);