#include <cassert>
#include <iomanip>
#include <sstream>
-#include <string>
+#include <stack>
#include "movegen.h"
#include "notation.h"
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
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;
string move = square_to_string(from) + square_to_string(to);
if (type_of(m) == PROMOTION)
- move += PieceToChar[make_piece(BLACK, promotion_type(m))]; // Lower case
+ move += PieceToChar[BLACK][promotion_type(m)]; // Lower case
return move;
}
{
if (pt != PAWN)
{
- san = PieceToChar[pt]; // Upper case
+ 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.
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)))
/// 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;
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;
- StateInfo state[MAX_PLY_PLUS_2], *st = state;
+ std::stack<StateInfo> st;
Move* m = pv;
string san, padding;
size_t length;
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 << " ";
s << san << ' ';
length += san.length() + 1;
- pos.do_move(*m++, *st++);
+ st.push(StateInfo());
+ pos.do_move(*m++, st.top());
}
while (m != pv)