X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=8cc0c004dac94bd27171ddefab6ce77d0baedce2;hp=5ea874e07575bd03ed2087d26766478e0f47e8c0;hb=ad1f28bc1c1c5426fb8ab246f5d43ad57002b4d5;hpb=56de5ae5616bf8766491d2585751b11da268559c

diff --git a/src/move.cpp b/src/move.cpp
index 5ea874e0..8cc0c004 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -17,136 +17,238 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
 #include <cassert>
-#include <cctype>
+#include <cstring>
+#include <iomanip>
+#include <string>
+#include <sstream>
 
 #include "move.h"
-#include "piece.h"
+#include "movegen.h"
 #include "position.h"
 
+using std::string;
 
-////
-//// Functions
-////
+namespace {
+  const string time_string(int milliseconds);
+  const string score_string(Value v);
+}
 
-/// move_from_uci() takes a position and a string as input, and attempts to
-/// convert the string to a move, using simple coordinate notation (g1f3,
-/// a7a8q, etc.). In order to correctly parse en passant captures and castling
-/// moves, we need the position. This function is not robust, and expects that
-/// the input move is legal and correctly formatted.
 
-Move move_from_uci(const Position& pos, const std::string& 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 in the e1g1 notation in normal chess mode, and in e1h1 notation in
+/// Chess960 mode. Instead internally Move is coded as "king captures rook".
 
-  Square from, to;
-  Piece piece;
-  Color us = pos.side_to_move();
+const string move_to_uci(Move m, bool chess960) {
 
-  if (str.length() < 4)
-      return MOVE_NONE;
+  Square from = move_from(m);
+  Square to = move_to(m);
+  string promotion;
 
-  // Read the from and to squares
-  from = make_square(file_from_char(str[0]), rank_from_char(str[1]));
-  to   = make_square(file_from_char(str[2]), rank_from_char(str[3]));
+  if (m == MOVE_NONE)
+      return "(none)";
 
-  // Find the moving piece
-  piece = pos.piece_on(from);
+  if (m == MOVE_NULL)
+      return "0000";
+
+  if (move_is_castle(m) && !chess960)
+      to = from + (square_file(to) == FILE_H ? Square(2) : -Square(2));
+
+  if (move_is_promotion(m))
+      promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
+
+  return square_to_string(from) + square_to_string(to) + promotion;
+}
 
-  // If the string has more than 4 characters, try to interpret the 5th
-  // character as a promotion.
-  if (str.length() > 4 && piece == piece_of_color_and_type(us, PAWN))
-  {
-      switch (tolower(str[4])) {
-      case 'n':
-          return make_promotion_move(from, to, KNIGHT);
-      case 'b':
-          return make_promotion_move(from, to, BISHOP);
-      case 'r':
-          return make_promotion_move(from, to, ROOK);
-      case 'q':
-          return make_promotion_move(from, to, QUEEN);
-      }
-  }
 
-  // En passant move? We assume that a pawn move is an en passant move
-  // if the destination square is epSquare.
-  if (to == pos.ep_square() && piece == piece_of_color_and_type(us, PAWN))
-      make_ep_move(from, to);
+/// move_from_uci() takes a position and a string representing a move in
+/// simple coordinate notation and returns an equivalent Move if any.
+/// Moves are guaranteed to be legal.
 
-  // Is this a castling move? A king move is assumed to be a castling move
-  // if the destination square is occupied by a friendly rook, or if the
-  // distance between the source and destination squares is more than 1.
-  if (piece == piece_of_color_and_type(us, KING))
+Move move_from_uci(const Position& pos, const string& str) {
+
+  for (MoveList<MV_LEGAL> ml(pos); !ml.end(); ++ml)
+      if (str == move_to_uci(ml.move(), pos.is_chess960()))
+          return ml.move();
+
+  return MOVE_NONE;
+}
+
+
+/// move_to_san() takes a position and a move as input, where it is assumed
+/// that the move is a legal move for the position. The return value is
+/// a string containing the move in short algebraic notation.
+
+const string move_to_san(Position& pos, Move m) {
+
+  if (m == MOVE_NONE)
+      return "(none)";
+
+  if (m == MOVE_NULL)
+      return "(null)";
+
+  assert(move_is_ok(m));
+
+  Bitboard attackers;
+  bool ambiguousMove, ambiguousFile, ambiguousRank;
+  Square sq, from = move_from(m);
+  Square to = move_to(m);
+  PieceType pt = piece_type(pos.piece_on(from));
+  string san;
+
+  if (move_is_castle(m))
+      san = (move_to(m) < move_from(m) ? "O-O-O" : "O-O");
+  else
   {
-      if (pos.piece_on(to) == piece_of_color_and_type(us, ROOK))
-          return make_castle_move(from, to);
+      if (pt != PAWN)
+      {
+          san = piece_type_to_char(pt);
+
+          // 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(pt, pos.side_to_move());
+          clear_bit(&attackers, from);
+          ambiguousMove = ambiguousFile = ambiguousRank = false;
+
+          while (attackers)
+          {
+              sq = pop_1st_bit(&attackers);
+
+              if (square_file(sq) == square_file(from))
+                  ambiguousFile = true;
+
+              if (square_rank(sq) == square_rank(from))
+                  ambiguousRank = true;
+
+              ambiguousMove = true;
+          }
+
+          if (ambiguousMove)
+          {
+              if (!ambiguousFile)
+                  san += file_to_char(square_file(from));
+              else if (!ambiguousRank)
+                  san += rank_to_char(square_rank(from));
+              else
+                  san += square_to_string(from);
+          }
+      }
 
-      if (square_distance(from, to) > 1)
+      if (pos.move_is_capture(m))
       {
-          // This is a castling move, but we have to translate it to the
-          // internal "king captures rook" representation.
-          SquareDelta delta = (to > from ? DELTA_E : DELTA_W);
-          Square s = from;
+          if (pt == PAWN)
+              san += file_to_char(square_file(from));
+
+          san += 'x';
+      }
 
-          do s += delta;
-          while (   pos.piece_on(s) != piece_of_color_and_type(us, ROOK)
-                 && relative_rank(us, s) == RANK_1);
+      san += square_to_string(to);
 
-          return relative_rank(us, s) == RANK_1 ? make_castle_move(from, s) : MOVE_NONE;
+      if (move_is_promotion(m))
+      {
+          san += '=';
+          san += piece_type_to_char(promotion_piece_type(m));
       }
   }
 
-  return make_move(from, to);
+  // The move gives check? We don't use pos.move_gives_check() here
+  // because we need to test for a mate after the move is done.
+  StateInfo st;
+  pos.do_move(m, st);
+  if (pos.in_check())
+      san += pos.is_mate() ? "#" : "+";
+  pos.undo_move(m);
+
+  return san;
 }
 
 
-/// 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 in the e1g1 notation in normal chess mode, and in e1h1 notation in
-/// Chess960 mode.
+/// 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 std::string move_to_uci(Move move, bool chess960) {
+const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]) {
 
-  std::string str;
-  Square from = move_from(move);
-  Square to = move_to(move);
+  const int64_t K = 1000;
+  const int64_t M = 1000000;
+  const int startColumn = 28;
+  const size_t maxLength = 80 - startColumn;
+  const string lf = string("\n") + string(startColumn, ' ');
 
-  if (move == MOVE_NONE)
-      str = "(none)";
-  else if (move == MOVE_NULL)
-      str = "0000";
+  StateInfo state[PLY_MAX_PLUS_2], *st = state;
+  Move* m = pv;
+  string san;
+  std::stringstream s;
+  size_t length = 0;
+
+  // First print depth, score, time and searched nodes...
+  s << std::setw(2) << depth
+    << std::setw(8) << score_string(score)
+    << std::setw(8) << time_string(time);
+
+  if (pos.nodes_searched() < M)
+      s << std::setw(8) << pos.nodes_searched() / 1 << "  ";
+  else if (pos.nodes_searched() < K * M)
+      s << std::setw(7) << pos.nodes_searched() / K << "K  ";
   else
+      s << std::setw(7) << pos.nodes_searched() / M << "M  ";
+
+  // ...then print the full PV line in short algebraic notation
+  while (*m != MOVE_NONE)
   {
-      if (move_is_short_castle(move) && !chess960)
-          return (from == SQ_E1 ? "e1g1" : "e8g8");
+      san = move_to_san(pos, *m);
+      length += san.length() + 1;
 
-      if (move_is_long_castle(move) && !chess960)
-          return (from == SQ_E1 ? "e1c1" : "e8c8");
+      if (length > maxLength)
+      {
+          length = san.length() + 1;
+          s << lf;
+      }
+      s << san << ' ';
 
-      str = square_to_string(from) + square_to_string(to);
-      if (move_is_promotion(move))
-          str += char(tolower(piece_type_to_char(move_promotion_piece(move))));
+      pos.do_move(*m++, *st++);
   }
-  return str;
+
+  // Restore original position before to leave
+  while (m != pv) pos.undo_move(*--m);
+
+  return s.str();
 }
 
 
-/// Overload the << operator, to make it easier to print moves.
+namespace {
 
-std::ostream& operator << (std::ostream& os, Move m) {
+  const string time_string(int millisecs) {
 
-  bool chess960 = (os.iword(0) != 0); // See set960()
-  return os << move_to_uci(m, chess960);
-}
+    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;
 
+    std::stringstream s;
 
-/// move_is_ok(), for debugging.
+    if (hours)
+        s << hours << ':';
 
-bool move_is_ok(Move m) {
+    s << std::setfill('0') << std::setw(2) << minutes << ':' << std::setw(2) << seconds;
+    return s.str();
+  }
+
+
+  const string score_string(Value v) {
 
-  return square_is_ok(move_from(m)) && square_is_ok(move_to(m));
+    std::stringstream s;
+
+    if (v >= VALUE_MATE - 200)
+        s << "#" << (VALUE_MATE - v + 1) / 2;
+    else if (v <= -VALUE_MATE + 200)
+        s << "-#" << (VALUE_MATE + v) / 2;
+    else
+        s << std::setprecision(2) << std::fixed << std::showpos << float(v) / PawnValueMidgame;
+
+    return s.str();
+  }
 }