X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fnotation.cpp;h=d167c2ff446208c5b0b534a2b2c2971518bbd9b1;hp=3686016b3eb6c92da2550f19df4f6c746a8d9aa3;hb=2469daebb1b2ec2ca1653754c35327c16838938e;hpb=a903ed07e02780aec98f97461329acb78d7242c8

diff --git a/src/notation.cpp b/src/notation.cpp
index 3686016b..d167c2ff 100644
--- a/src/notation.cpp
+++ b/src/notation.cpp
@@ -18,27 +18,25 @@
 */
 
 #include <cassert>
-#include <iomanip>
 #include <sstream>
-#include <stack>
 
 #include "movegen.h"
-#include "notation.h"
 #include "position.h"
+#include "uci.h"
 
 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
+/// 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) {
+string UCI::format_value(Value v, Value alpha, Value beta) {
 
   stringstream ss;
 
@@ -53,12 +51,20 @@ string score_to_uci(Value v, Value alpha, Value beta) {
 }
 
 
-/// move_to_uci() converts a move to a string in coordinate notation
+/// format_square() converts a Square to a string (g1, a7, etc.)
+
+std::string UCI::format_square(Square s) {
+  char ch[] = { 'a' + file_of(s), '1' + rank_of(s), 0 };
+  return ch;
+}
+
+
+/// format_move() converts a Move to a string in coordinate notation
 /// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print
 /// in the e1g1 notation in normal chess mode, and in e1h1 notation in chess960
 /// mode. Internally castling moves are always encoded as "king captures rook".
 
-const string move_to_uci(Move m, bool chess960) {
+string UCI::format_move(Move m, bool chess960) {
 
   Square from = from_sq(m);
   Square to = to_sq(m);
@@ -72,7 +78,7 @@ const string move_to_uci(Move m, bool chess960) {
   if (type_of(m) == CASTLING && !chess960)
       to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
 
-  string move = to_string(from) + to_string(to);
+  string move = format_square(from) + format_square(to);
 
   if (type_of(m) == PROMOTION)
       move += PieceToChar[BLACK][promotion_type(m)]; // Lower case
@@ -81,82 +87,17 @@ const string move_to_uci(Move m, bool chess960) {
 }
 
 
-/// move_from_uci() takes a position and a string representing a move in
+/// to_move() takes a position and a string representing a move in
 /// simple coordinate notation and returns an equivalent legal Move if any.
 
-Move move_from_uci(const Position& pos, string& str) {
+Move UCI::to_move(const Position& pos, string& str) {
 
   if (str.length() == 5) // Junior could send promotion piece in uppercase
       str[4] = char(tolower(str[4]));
 
   for (MoveList<LEGAL> it(pos); *it; ++it)
-      if (str == move_to_uci(*it, pos.is_chess960()))
+      if (str == format_move(*it, pos.is_chess960()))
           return *it;
 
   return MOVE_NONE;
 }
-
-
-/// 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 the time and score respectively.
-
-static string format(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 ss;
-
-  if (hours)
-      ss << hours << ':';
-
-  ss << setfill('0') << setw(2) << minutes << ':' << setw(2) << seconds;
-
-  return ss.str();
-}
-
-static string format(Value v) {
-
-  stringstream ss;
-
-  if (v >= VALUE_MATE_IN_MAX_PLY)
-      ss << "#" << (VALUE_MATE - v + 1) / 2;
-
-  else if (v <= VALUE_MATED_IN_MAX_PLY)
-      ss << "-#" << (VALUE_MATE + v) / 2;
-
-  else
-      ss << setprecision(2) << fixed << showpos << double(v) / PawnValueEg;
-
-  return ss.str();
-}
-
-string pretty_pv(const Position& pos, int depth, Value value, int64_t msecs, Move pv[]) {
-
-  const uint64_t K = 1000;
-  const uint64_t M = 1000000;
-
-  stringstream ss;
-  ss << setw(2) << depth << setw(8) << format(value) << setw(8) << format(msecs);
-
-  if (pos.nodes_searched() < M)
-      ss << setw(8) << pos.nodes_searched() / 1 << "  ";
-
-  else if (pos.nodes_searched() < K * M)
-      ss << setw(7) << pos.nodes_searched() / K << "K  ";
-
-  else
-      ss << setw(7) << pos.nodes_searched() / M << "M  ";
-
-  string str = ss.str();
-
-  for (Move *m = pv; *m != MOVE_NONE; m++)
-      str += move_to_uci(*m, pos.is_chess960()) + ' ';
-
-  return str;
-}