X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fnotation.cpp;h=db5f58b90d3099e1eae631d33cefca8791227d3d;hp=7736dbcb6fcd491ef56c93dcef47037d8986f28f;hb=e304db9d1ecf6a2318708483c90fadecf4fac4ee;hpb=dc7fd868f4fa41251a9521a0b25e3adb483bfd83

diff --git a/src/notation.cpp b/src/notation.cpp
index 7736dbcb..db5f58b9 100644
--- a/src/notation.cpp
+++ b/src/notation.cpp
@@ -18,12 +18,40 @@
 */
 
 #include <cassert>
+#include <iomanip>
+#include <sstream>
 #include <string>
 
 #include "movegen.h"
+#include "notation.h"
 #include "position.h"
 
-using std::string;
+using namespace std;
+
+static const char* PieceToChar[COLOR_NB] = { "PNBRQK", "pnbrqk" };
+
+
+/// score_to_uci() converts a value to a string suitable for use with the UCI
+/// protocol specifications:
+///
+/// cp <x>     The score from the engine's point of view in centipawns.
+/// mate <y>   Mate in y moves, not plies. If the engine is getting mated
+///            use negative values for y.
+
+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(PawnValueMg);
+  else
+      s << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
+
+  s << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
+
+  return s.str();
+}
+
 
 /// move_to_uci() converts a move to a string in coordinate notation
 /// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print
@@ -47,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 += char(tolower(piece_type_to_char(promotion_type(m))));
+      move += PieceToChar[BLACK][promotion_type(m)]; // Lower case
 
   return move;
 }
@@ -85,9 +113,11 @@ const string move_to_san(Position& pos, Move m) {
   Bitboard attackers;
   bool ambiguousMove, ambiguousFile, ambiguousRank;
   string san;
+  Color us = pos.side_to_move();
   Square from = from_sq(m);
   Square to = to_sq(m);
-  PieceType pt = type_of(pos.piece_on(from));
+  Piece pc = pos.piece_on(from);
+  PieceType pt = type_of(pc);
 
   if (type_of(m) == CASTLE)
       san = to > from ? "O-O" : "O-O-O";
@@ -95,17 +125,17 @@ const string move_to_san(Position& pos, Move m) {
   {
       if (pt != PAWN)
       {
-          san = piece_type_to_char(pt);
+          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.
-          attackers = pos.attackers_to(to) & pos.pieces(pos.side_to_move(), pt);
-          attackers ^= from;
           ambiguousMove = ambiguousFile = ambiguousRank = false;
 
+          attackers = (pos.attacks_from(pc, to) & pos.pieces(us, pt)) ^ from;
+
           while (attackers)
           {
-              Square sq = pop_1st_bit(&attackers);
+              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()))
@@ -128,19 +158,16 @@ const string move_to_san(Position& pos, Move m) {
                   san += square_to_string(from);
           }
       }
+      else if (pos.is_capture(m))
+          san = file_to_char(file_of(from));
 
       if (pos.is_capture(m))
-      {
-          if (pt == PAWN)
-              san += file_to_char(file_of(from));
-
           san += 'x';
-      }
 
       san += square_to_string(to);
 
       if (type_of(m) == PROMOTION)
-          san += string("=") + piece_type_to_char(promotion_type(m));
+          san += string("=") + PieceToChar[WHITE][promotion_type(m)];
   }
 
   if (pos.move_gives_check(m, CheckInfo(pos)))
@@ -153,3 +180,92 @@ const string move_to_san(Position& pos, Move m) {
 
   return san;
 }
+
+
+/// pretty_pv() formats human-readable search information, typically to be
+/// appended to the search log file. It uses the two helpers below to pretty
+/// format time and score respectively.
+
+static string time_to_string(int64_t msecs) {
+
+  const int MSecMinute = 1000 * 60;
+  const int MSecHour   = 1000 * 60 * 60;
+
+  int64_t hours   =   msecs / MSecHour;
+  int64_t minutes =  (msecs % MSecHour) / MSecMinute;
+  int64_t seconds = ((msecs % MSecHour) % MSecMinute) / 1000;
+
+  stringstream s;
+
+  if (hours)
+      s << hours << ':';
+
+  s << setfill('0') << setw(2) << minutes << ':' << setw(2) << seconds;
+
+  return s.str();
+}
+
+static string score_to_string(Value v) {
+
+  stringstream s;
+
+  if (v >= VALUE_MATE_IN_MAX_PLY)
+      s << "#" << (VALUE_MATE - v + 1) / 2;
+
+  else if (v <= VALUE_MATED_IN_MAX_PLY)
+      s << "-#" << (VALUE_MATE + v) / 2;
+
+  else
+      s << setprecision(2) << fixed << showpos << float(v) / PawnValueMg;
+
+  return s.str();
+}
+
+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;
+  Move* m = pv;
+  string san, padding;
+  size_t length;
+  stringstream s;
+
+  s << setw(2) << depth
+    << setw(8) << score_to_string(value)
+    << setw(8) << time_to_string(msecs);
+
+  if (pos.nodes_searched() < M)
+      s << setw(8) << pos.nodes_searched() / 1 << "  ";
+
+  else if (pos.nodes_searched() < K * M)
+      s << setw(7) << pos.nodes_searched() / K << "K  ";
+
+  else
+      s << setw(7) << pos.nodes_searched() / M << "M  ";
+
+  padding = string(s.str().length(), ' ');
+  length = padding.length();
+
+  while (*m != MOVE_NONE)
+  {
+      san = move_to_san(pos, *m);
+
+      if (length + san.length() > 80)
+      {
+          s << "\n" + padding;
+          length = padding.length();
+      }
+
+      s << san << ' ';
+      length += san.length() + 1;
+
+      pos.do_move(*m++, *st++);
+  }
+
+  while (m != pv)
+      pos.undo_move(*--m);
+
+  return s.str();
+}