X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=1b33ff68f721993c42e2712b284fcd50c0d3d5a8;hp=221aac60a3aeb3baa0e165de1437d027499e42a9;hb=d6fdd4f6d95a2a958a73484fb7505460b12af28e;hpb=b4acf83704c9bab4d78d9ec76ecbdfbfa0b0c88c

diff --git a/src/move.cpp b/src/move.cpp
index 221aac60..1b33ff68 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -30,6 +30,7 @@
 
 #include "move.h"
 #include "movegen.h"
+#include "search.h"
 
 using std::string;
 
@@ -174,74 +175,56 @@ const string move_to_san(Position& pos, Move m) {
 }
 
 
-/// line_to_san() takes a position and a line (an array of moves representing
-/// a sequence of legal moves from the position) as input, and returns a
-/// string containing the line in short algebraic notation.  If the boolean
-/// parameter 'breakLines' is true, line breaks are inserted, with a line
-/// length of 80 characters.  After a line break, 'startColumn' spaces are
-/// inserted at the beginning of the new line.
-
-const string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines) {
-
-  StateInfo st;
-  std::stringstream s;
-  string moveStr;
-  size_t length = 0;
-  size_t maxLength = 80 - startColumn;
-  Position p(pos, pos.thread());
-
-  for (Move* m = line; *m != MOVE_NONE; m++)
-  {
-      moveStr = move_to_san(p, *m);
-      length += moveStr.length() + 1;
-      if (breakLines && length > maxLength)
-      {
-          s << "\n" << std::setw(startColumn) << " ";
-          length = moveStr.length() + 1;
-      }
-      s << moveStr << ' ';
-
-      if (*m == MOVE_NULL)
-          p.do_null_move(st);
-      else
-          p.do_move(*m, st);
-  }
-  return s.str();
-}
-
-
 /// pretty_pv() creates a human-readable string from a position and a PV.
 /// 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,
+const string pretty_pv(Position& pos, int time, int depth,
                        Value score, ValueType type, Move pv[]) {
 
   const int64_t K = 1000;
   const int64_t M = 1000000;
+  const int startColumn = 29;
+  const size_t maxLength = 80 - startColumn;
+  const string lf = string("\n") + string(startColumn, ' ');
 
+  StateInfo state[PLY_MAX_PLUS_2], *st = state;
+  Move* m = pv;
   std::stringstream s;
+  string san;
+  size_t length = 0;
 
-  // Depth
-  s << std::setw(2) << depth << "  ";
-
-  // Score
-  s << (type == VALUE_TYPE_LOWER ? ">" : type == VALUE_TYPE_UPPER ? "<" : " ")
-    << std::setw(7) << score_string(score);
-
-  // Time
-  s << std::setw(8) << time_string(time) << " ";
+  // First print depth, score, time and searched nodes...
+  s << std::setw(2) << depth
+    << (type == VALUE_TYPE_LOWER ? " >" : type == VALUE_TYPE_UPPER ? " <" : "  ")
+    << std::setw(7) << score_string(score)
+    << std::setw(8) << time_string(time);
 
-  // Nodes
   if (pos.nodes_searched() < M)
-      s << std::setw(8) << pos.nodes_searched() / 1 << " ";
+      s << std::setw(8) << pos.nodes_searched() / 1 << "  ";
   else if (pos.nodes_searched() < K * M)
-      s << std::setw(7) << pos.nodes_searched() / K << "K ";
+      s << std::setw(7) << pos.nodes_searched() / K << " K ";
   else
-      s << std::setw(7) << pos.nodes_searched() / M << "M ";
+      s << std::setw(7) << pos.nodes_searched() / M << " M ";
+
+  // ...then print the full PV line in short algebraic notation
+  while (*m != MOVE_NONE)
+  {
+      san = move_to_san(pos, *m);
+      length += san.length() + 1;
+
+      if (length > maxLength)
+      {
+          length = san.length() + 1;
+          s << lf;
+      }
+      s << san << ' ';
+
+      pos.do_move(*m++, *st++);
+  }
 
-  // PV
-  s << line_to_san(pos, pv, 30, true);
+  // Restore original position before to leave
+  while (m != pv) pos.undo_move(*--m);
 
   return s.str();
 }