X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=8cc0c004dac94bd27171ddefab6ce77d0baedce2;hp=8c2374fcfacf901b763ae85a706e884cf0886644;hb=03ad183384d484990248cb22394a93926f421520;hpb=d52d91064f88a1aaf391112048fad9694427387e diff --git a/src/move.cpp b/src/move.cpp index 8c2374fc..8cc0c004 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -17,11 +17,6 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - #include #include #include @@ -30,40 +25,26 @@ #include "move.h" #include "movegen.h" -#include "search.h" +#include "position.h" using std::string; -//// -//// Local definitions -//// - namespace { - - enum Ambiguity { - AMBIGUITY_NONE, AMBIGUITY_FILE, AMBIGUITY_RANK, AMBIGUITY_BOTH - }; - - Ambiguity move_ambiguity(const Position& pos, Move m); const string time_string(int milliseconds); const string score_string(Value v); } -//// -//// 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. +/// Chess960 mode. Instead internally Move is coded as "king captures rook". -const std::string move_to_uci(Move m, bool chess960) { +const string move_to_uci(Move m, bool chess960) { - std::string promotion; Square from = move_from(m); Square to = move_to(m); + string promotion; if (m == MOVE_NONE) return "(none)"; @@ -71,79 +52,86 @@ const std::string move_to_uci(Move m, bool chess960) { if (m == MOVE_NULL) return "0000"; - if (move_is_short_castle(m) && !chess960) - return from == SQ_E1 ? "e1g1" : "e8g8"; - - if (move_is_long_castle(m) && !chess960) - return from == SQ_E1 ? "e1c1" : "e8c8"; + 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(move_promotion_piece(m)))); + promotion = char(tolower(piece_type_to_char(promotion_piece_type(m)))); return square_to_string(from) + square_to_string(to) + promotion; } /// move_from_uci() takes a position and a string representing a move in -/// simple coordinate notation and returns an equivalent Move. - -Move move_from_uci(const Position& pos, const std::string& str) { +/// simple coordinate notation and returns an equivalent Move if any. +/// Moves are guaranteed to be legal. - MoveStack mlist[MOVES_MAX]; - MoveStack* last = generate(pos, mlist); +Move move_from_uci(const Position& pos, const string& str) { - for (MoveStack* cur = mlist; cur != last; cur++) - if (str == move_to_uci(cur->move, pos.is_chess960())) - return cur->move; + 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_san() takes a position and a move as input, where it is assumed -/// that the move is a legal move from the position. The return value is +/// 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) { - assert(pos.is_ok()); - assert(move_is_ok(m)); - - string san; - Square from = move_from(m); - Square to = move_to(m); - PieceType pt = type_of_piece(pos.piece_on(from)); - if (m == MOVE_NONE) return "(none)"; if (m == MOVE_NULL) return "(null)"; - if (move_is_long_castle(m)) - san = "O-O-O"; - else if (move_is_short_castle(m)) - san = "O-O"; + 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 (pt != PAWN) { - san += piece_type_to_char(pt); - - switch (move_ambiguity(pos, m)) { - case AMBIGUITY_NONE: - break; - case AMBIGUITY_FILE: - san += file_to_char(square_file(from)); - break; - case AMBIGUITY_RANK: - san += rank_to_char(square_rank(from)); - break; - case AMBIGUITY_BOTH: - san += square_to_string(from); - break; - default: - assert(false); + 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); } } @@ -154,20 +142,21 @@ const string move_to_san(Position& pos, Move m) { san += 'x'; } + san += square_to_string(to); if (move_is_promotion(m)) { san += '='; - san += piece_type_to_char(move_promotion_piece(m)); + san += piece_type_to_char(promotion_piece_type(m)); } } - // The move gives check ? We don't use pos.move_is_check() here - // because we need to test for mate after the move is done. + // 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.is_check()) + if (pos.in_check()) san += pos.is_mate() ? "#" : "+"; pos.undo_move(m); @@ -189,8 +178,8 @@ const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[ StateInfo state[PLY_MAX_PLUS_2], *st = state; Move* m = pv; - std::stringstream s; string san; + std::stringstream s; size_t length = 0; // First print depth, score, time and searched nodes... @@ -201,9 +190,9 @@ const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[ 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 "; + 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) @@ -230,35 +219,6 @@ const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[ namespace { - Ambiguity move_ambiguity(const Position& pos, Move m) { - - MoveStack mlist[MOVES_MAX]; - Piece pc = pos.piece_on(move_from(m)); - int f = 0, r = 0; - - MoveStack* last = generate(pos, mlist); - - // Collect all legal moves of piece 'pc' with destination 'to' - for (MoveStack* cur = mlist; cur != last; cur++) - { - if ( move_to(cur->move) == move_to(m) - && pos.piece_on(move_from(cur->move)) == pc) - { - if (square_file(move_from(cur->move)) == square_file(move_from(m))) - f++; - - if (square_rank(move_from(cur->move)) == square_rank(move_from(m))) - r++; - } - } - - assert(f > 0 && r > 0); - - return f == 1 ? (r == 1 ? AMBIGUITY_NONE : AMBIGUITY_FILE) - : (r == 1 ? AMBIGUITY_RANK : AMBIGUITY_BOTH); - } - - const string time_string(int millisecs) { const int MSecMinute = 1000 * 60;