X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=d079ee7b56f840b4aaebe61c48066446eb49fe34;hp=7b06b0ecaf0e33a120a709dbe8ea4975e44d7bdd;hb=11a79809767e60897e0b015651db30ce1d36b69a;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c
diff --git a/src/move.cpp b/src/move.cpp
index 7b06b0ec..d079ee7b 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -17,136 +17,143 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
+#include
+#include
-#include "move.h"
-#include "piece.h"
+#include "movegen.h"
#include "position.h"
+using std::string;
-////
-//// Functions
-////
+/// 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".
-/// move_from_string() 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.
+const string move_to_uci(Move m, bool chess960) {
-Move move_from_string(const Position& pos, const std::string& str) {
+ Square from = move_from(m);
+ Square to = move_to(m);
+ string promotion;
- Square from, to;
- Piece piece;
- Color us = pos.side_to_move();
+ if (m == MOVE_NONE)
+ return "(none)";
- if (str.length() < 4)
- return MOVE_NONE;
+ if (m == MOVE_NULL)
+ return "0000";
- // Read the from and to squares
- from = square_from_string(str.substr(0, 2));
- to = square_from_string(str.substr(2, 4));
+ if (is_castle(m) && !chess960)
+ to = from + (file_of(to) == FILE_H ? Square(2) : -Square(2));
- // Find the moving piece
- piece = pos.piece_on(from);
+ if (is_promotion(m))
+ promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
- // If the string has more than 4 characters, try to interpret the 5th
- // character as a promotion
- if (type_of_piece(piece) == PAWN && str.length() > 4)
- {
- 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);
- }
- }
+ return square_to_string(from) + square_to_string(to) + promotion;
+}
- if (piece == piece_of_color_and_type(us, KING))
- {
- // 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 (pos.piece_on(to) == piece_of_color_and_type(us, ROOK))
- return make_castle_move(from, to);
-
- else if (square_distance(from, to) > 1)
- {
- // 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 + delta;
- while (relative_rank(us, s) == RANK_1 && pos.piece_on(s) != piece_of_color_and_type(us, ROOK))
- s += delta;
-
- return (relative_rank(us, s) == RANK_1 ? make_castle_move(from, s) : MOVE_NONE);
- }
- }
- else if (piece == piece_of_color_and_type(us, PAWN))
- {
- // En passant move? We assume that a pawn move is an en passant move
- // without further testing if the destination square is epSquare.
- if (to == pos.ep_square())
- return make_ep_move(from, to);
- }
- return make_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.
+
+Move move_from_uci(const Position& pos, const string& str) {
+
+ for (MoveList ml(pos); !ml.end(); ++ml)
+ if (str == move_to_uci(ml.move(), pos.is_chess960()))
+ return ml.move();
+
+ return MOVE_NONE;
}
-/// move_to_string() 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.
+/// 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)";
-const std::string move_to_string(Move move) {
+ assert(is_ok(m));
- std::string str;
- Square from = move_from(move);
- Square to = move_to(move);
+ Bitboard attackers;
+ bool ambiguousMove, ambiguousFile, ambiguousRank;
+ Square sq, from = move_from(m);
+ Square to = move_to(m);
+ PieceType pt = type_of(pos.piece_on(from));
+ string san;
- if (move == MOVE_NONE)
- str = "(none)";
- else if (move == MOVE_NULL)
- str = "0000";
+ if (is_castle(m))
+ san = (move_to(m) < move_from(m) ? "O-O-O" : "O-O");
else
{
- if (!Chess960)
+ if (pt != PAWN)
{
- if (move_is_short_castle(move))
- return (from == SQ_E1 ? "e1g1" : "e8g8");
-
- if (move_is_long_castle(move))
- return (from == SQ_E1 ? "e1c1" : "e8c8");
+ 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);
+
+ // Pinned pieces are not included in the possible sub-set
+ if (!pos.pl_move_is_legal(make_move(sq, to), pos.pinned_pieces()))
+ continue;
+
+ if (file_of(sq) == file_of(from))
+ ambiguousFile = true;
+
+ if (rank_of(sq) == rank_of(from))
+ ambiguousRank = true;
+
+ ambiguousMove = true;
+ }
+
+ if (ambiguousMove)
+ {
+ if (!ambiguousFile)
+ san += file_to_char(file_of(from));
+ else if (!ambiguousRank)
+ san += rank_to_char(rank_of(from));
+ else
+ san += square_to_string(from);
+ }
}
- str = square_to_string(from) + square_to_string(to);
- if (move_is_promotion(move))
- str += piece_type_to_char(move_promotion_piece(move), false);
- }
- return str;
-}
-
-/// Overload the << operator, to make it easier to print moves.
-
-std::ostream &operator << (std::ostream& os, Move m) {
+ if (pos.is_capture(m))
+ {
+ if (pt == PAWN)
+ san += file_to_char(file_of(from));
- return os << move_to_string(m);
-}
+ san += 'x';
+ }
+ san += square_to_string(to);
-/// move_is_ok(), for debugging.
+ if (is_promotion(m))
+ {
+ san += '=';
+ san += piece_type_to_char(promotion_piece_type(m));
+ }
+ }
-bool move_is_ok(Move m) {
+ // 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 square_is_ok(move_from(m)) && square_is_ok(move_to(m));
+ return san;
}