X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=cb6b5dfdc3bd80ad27f6e3e1dc100103ca86c69d;hp=f23fcbe021796f086fe9cadf9fd5479f8f4f9773;hb=916c0cbfbca460e358357b5ff55fb02b40e7142d;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86
diff --git a/src/move.cpp b/src/move.cpp
index f23fcbe0..cb6b5dfd 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -1,18 +1,18 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -23,126 +23,130 @@
////
#include
+#include
#include "move.h"
#include "piece.h"
#include "position.h"
-#include "ucioption.h"
////
//// Functions
////
-/// move_from_string() takes a position and a string as input, and attempts to
+/// 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
+/// 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_string(const Position &pos, const std::string &str) {
+Move move_from_uci(const Position& pos, const std::string& str) {
+
Square from, to;
Piece piece;
Color us = pos.side_to_move();
- if(str.length() < 4) return MOVE_NONE;
+ if (str.length() < 4)
+ return MOVE_NONE;
- // Read the from and to squares:
- from = square_from_string(str.substr(0, 2));
- to = square_from_string(str.substr(2, 4));
+ // 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]));
- // Find the moving piece:
+ // Find the moving piece
piece = pos.piece_on(from);
// 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() >= 5) {
- switch(str[4]) {
- case 'n': case 'N':
- return make_promotion_move(from, to, KNIGHT);
- case 'b': case 'B':
- return make_promotion_move(from, to, BISHOP);
- case 'r': case 'R':
- return make_promotion_move(from, to, ROOK);
- case 'q': case 'Q':
- return make_promotion_move(from, to, QUEEN);
- }
+ // 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);
+ }
}
- if(piece == king_of_color(us)) {
- // 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) == rook_of_color(us))
- 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;
- for(s = from + delta;
- relative_rank(us, s) == RANK_1 && pos.piece_on(s) != rook_of_color(us);
- s += delta);
- if(relative_rank(us, s) == RANK_1 && pos.piece_on(s) == rook_of_color(us))
- return make_castle_move(from, s);
- }
- }
- else if(piece == pawn_of_color(us)) {
- // 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())
+ // 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))
return make_ep_move(from, to);
+
+ // 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))
+ {
+ if (pos.piece_on(to) == piece_of_color_and_type(us, ROOK))
+ return make_castle_move(from, to);
+
+ 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;
+
+ do s += delta;
+ while ( pos.piece_on(s) != piece_of_color_and_type(us, ROOK)
+ && relative_rank(us, s) == RANK_1);
+
+ return relative_rank(us, s) == RANK_1 ? make_castle_move(from, s) : MOVE_NONE;
+ }
}
return make_move(from, to);
}
-/// move_to_string() converts a move to a string in coordinate notation
-/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
+/// 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.
-const std::string move_to_string(Move move) {
- std::string str;
+const std::string move_to_uci(Move move, bool chess960) {
- if(move == MOVE_NONE)
- str = "(none)";
- else if(move == MOVE_NULL)
- str = "0000";
- else {
- if(!Chess960) {
- if(move_from(move) == SQ_E1 && move_is_short_castle(move)) {
- str = "e1g1"; return str;
- }
- else if(move_from(move) == SQ_E1 && move_is_long_castle(move)) {
- str = "e1c1"; return str;
- }
- if(move_from(move) == SQ_E8 && move_is_short_castle(move)) {
- str = "e8g8"; return str;
- }
- else if(move_from(move) == SQ_E8 && move_is_long_castle(move)) {
- str = "e8c8"; return str;
- }
- }
- str = square_to_string(move_from(move)) + square_to_string(move_to(move));
- if(move_promotion(move))
- str += piece_type_to_char(move_promotion(move), false);
+ std::string str;
+ Square from = move_from(move);
+ Square to = move_to(move);
+
+ if (move == MOVE_NONE)
+ str = "(none)";
+ else if (move == MOVE_NULL)
+ str = "0000";
+ else
+ {
+ if (move_is_short_castle(move) && !chess960)
+ return (from == SQ_E1 ? "e1g1" : "e8g8");
+
+ if (move_is_long_castle(move) && !chess960)
+ return (from == SQ_E1 ? "e1c1" : "e8c8");
+
+ 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))));
}
return str;
}
-/// Overload the << operator, to make it easier to print moves.
+/// Overload the << operator, to make it easier to print moves
+
+std::ostream& operator << (std::ostream& os, Move m) {
-std::ostream &operator << (std::ostream &os, Move m) {
- return os << move_to_string(m);
+ bool chess960 = (os.iword(0) != 0); // See set960()
+ return os << move_to_uci(m, chess960);
}
-/// move_is_ok(), for debugging.
+/// move_is_ok(), for debugging
bool move_is_ok(Move m) {
- return square_is_ok(move_from(m)) && square_is_ok(move_to(m));
+
+ return move_from(m) != move_to(m); // Catches also MOVE_NONE
}