X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fnotation.cpp;h=15661eec725ab7c7b788f51cc825cb9e201a57f1;hp=eb3c46a0244904e63588ef821b1e5714ffd5d468;hb=55df3fa2d7631ed67e46f9433aa7f3a71c18e5e7;hpb=520e680278964931abcaf3e1ab89b24423777999

diff --git a/src/notation.cpp b/src/notation.cpp
index eb3c46a0..15661eec 100644
--- a/src/notation.cpp
+++ b/src/notation.cpp
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <iomanip>
 #include <sstream>
-#include <string>
+#include <stack>
 
 #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;
 }
@@ -117,20 +117,21 @@ const string move_to_san(Position& pos, Move m) {
   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;
 
-          attackers = (pos.attacks_from(pc, to) & pos.pieces(us)) ^ from;
+          attackers = (pos.attacks_from(pc, to) & pos.pieces(us, pt)) ^ from;
 
           while (attackers)
           {
@@ -166,7 +167,7 @@ const string move_to_san(Position& pos, Move m) {
       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)))
@@ -185,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;
 
@@ -215,17 +216,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 << 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;
@@ -233,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 << "  ";
@@ -260,7 +261,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)