X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fnotation.cpp;h=fb65f6f5fa9f2bbb42275f2d4c55a9ee203bf4e6;hb=d471c49700fbe828159ba54a97946979f41500ae;hp=a26db6ff934c04434e16e431b7981dcc31217bcb;hpb=f0db6a6c0b82a5868bc1e95cb9faab9feba50e59;p=stockfish diff --git a/src/notation.cpp b/src/notation.cpp index a26db6ff..fb65f6f5 100644 --- a/src/notation.cpp +++ b/src/notation.cpp @@ -28,7 +28,7 @@ using namespace std; -static const char* PieceToChar = " PNBRQK pnbrqk"; +static const char* PieceToChar = " 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; @@ -186,14 +186,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; @@ -216,12 +216,12 @@ 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 << float(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; @@ -234,7 +234,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 << " ";