X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=7b8c4fcc62634e8eb086f867c3c6d0ee4d2a9fbf;hp=4a0a43b30fca539da6fb0d7db0e065904d8ab020;hb=67338e6f322b8f8ec0d897815e16a87937efc9b0;hpb=bc4f3155ae3937d32a3ebaae77ee4f7be355aa60 diff --git a/src/move.cpp b/src/move.cpp index 4a0a43b3..7b8c4fcc 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2012 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 @@ -19,31 +19,22 @@ #include #include -#include #include -#include -#include "move.h" #include "movegen.h" -#include "search.h" +#include "position.h" using std::string; -namespace { - const string time_string(int milliseconds); - const string score_string(Value v); -} - - /// 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 string move_to_uci(Move m, bool chess960) { - Square from = move_from(m); - Square to = move_to(m); + Square from = from_sq(m); + Square to = to_sq(m); string promotion; if (m == MOVE_NONE) @@ -52,14 +43,11 @@ const 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 (is_castle(m) && !chess960) + to = from + (file_of(to) == FILE_H ? Square(2) : -Square(2)); - if (move_is_promotion(m)) - promotion = char(tolower(piece_type_to_char(move_promotion_piece(m)))); + if (is_promotion(m)) + promotion = char(tolower(piece_type_to_char(promotion_piece_type(m)))); return square_to_string(from) + square_to_string(to) + promotion; } @@ -71,43 +59,37 @@ const string move_to_uci(Move m, bool chess960) { Move move_from_uci(const Position& pos, const string& str) { - MoveStack mlist[MAX_MOVES]; - MoveStack* last = generate(pos, mlist); - - 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)); - - Bitboard attackers; - bool ambiguousMove, ambiguousFile, ambiguousRank; - Square sq, from = move_from(m); - Square to = move_to(m); - PieceType pt = pos.type_of_piece_on(from); - string san; - 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(is_ok(m)); + + Bitboard attackers; + bool ambiguousMove, ambiguousFile, ambiguousRank; + Square sq, from = from_sq(m); + Square to = to_sq(m); + PieceType pt = type_of(pos.piece_on(from)); + string san; + + if (is_castle(m)) + san = (to_sq(m) < from_sq(m) ? "O-O-O" : "O-O"); else { if (pt != PAWN) @@ -124,10 +106,14 @@ const string move_to_san(Position& pos, Move m) { { sq = pop_1st_bit(&attackers); - if (square_file(sq) == square_file(from)) + // 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 (square_rank(sq) == square_rank(from)) + if (rank_of(sq) == rank_of(from)) ambiguousRank = true; ambiguousMove = true; @@ -136,28 +122,28 @@ const string move_to_san(Position& pos, Move m) { if (ambiguousMove) { if (!ambiguousFile) - san += file_to_char(square_file(from)); + san += file_to_char(file_of(from)); else if (!ambiguousRank) - san += rank_to_char(square_rank(from)); + san += rank_to_char(rank_of(from)); else san += square_to_string(from); } } - if (pos.move_is_capture(m)) + if (pos.is_capture(m)) { if (pt == PAWN) - san += file_to_char(square_file(from)); + san += file_to_char(file_of(from)); san += 'x'; } san += square_to_string(to); - if (move_is_promotion(m)) + if (is_promotion(m)) { san += '='; - san += piece_type_to_char(move_promotion_piece(m)); + san += piece_type_to_char(promotion_piece_type(m)); } } @@ -171,93 +157,3 @@ const string move_to_san(Position& pos, Move m) { return san; } - - -/// 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 string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]) { - - 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, ' '); - - 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) - { - san = move_to_san(pos, *m); - length += san.length() + 1; - - if (length > maxLength) - { - length = san.length() + 1; - s << lf; - } - s << san << ' '; - - pos.do_move(*m++, *st++); - } - - // Restore original position before to leave - while (m != pv) pos.undo_move(*--m); - - return s.str(); -} - - -namespace { - - const string time_string(int millisecs) { - - 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; - - if (hours) - s << hours << ':'; - - s << std::setfill('0') << std::setw(2) << minutes << ':' << std::setw(2) << seconds; - return s.str(); - } - - - const string score_string(Value v) { - - 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(); - } -}