X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=0a620781ce1be0a85eb9929bbf60691b504a7f42;hp=1b33ff68f721993c42e2712b284fcd50c0d3d5a8;hb=b21a5e2f0638a55daeaa98ba95afc6c016ea0b6e;hpb=5555b60b383e761ad02553136286929a9dd9546c
diff --git a/src/move.cpp b/src/move.cpp
index 1b33ff68..0a620781 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -17,11 +17,6 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
#include
#include
@@ -34,36 +29,22 @@
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.
-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)";
@@ -78,18 +59,19 @@ const std::string move_to_uci(Move m, bool chess960) {
return from == SQ_E1 ? "e1c1" : "e8c8";
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.
+/// simple coordinate notation and returns an equivalent Move if any.
+/// Moves are guaranteed to be legal.
-Move move_from_uci(const Position& pos, const std::string& str) {
+Move move_from_uci(const Position& pos, const string& str) {
- MoveStack mlist[MOVES_MAX];
+ MoveStack mlist[MAX_MOVES];
MoveStack* last = generate(pos, mlist);
for (MoveStack* cur = mlist; cur != last; cur++)
@@ -109,10 +91,12 @@ 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);
+ Bitboard attackers;
+ bool ambiguousMove, ambiguousFile, ambiguousRank;
+ Square sq, from = move_from(m);
Square to = move_to(m);
- PieceType pt = type_of_piece(pos.piece_on(from));
+ PieceType pt = pos.type_of_piece_on(from);
+ string san;
if (m == MOVE_NONE)
return "(none)";
@@ -128,22 +112,35 @@ const string move_to_san(Position& pos, Move m) {
{
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 +151,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);
@@ -179,33 +177,31 @@ const string move_to_san(Position& pos, Move m) {
/// 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 time, int depth,
- Value score, ValueType type, Move pv[]) {
+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 = 29;
+ 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;
- std::stringstream s;
string san;
+ std::stringstream s;
size_t length = 0;
// First print depth, score, time and searched nodes...
s << std::setw(2) << depth
- << (type == VALUE_TYPE_LOWER ? " >" : type == VALUE_TYPE_UPPER ? " <" : " ")
- << std::setw(7) << score_string(score)
+ << 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 ";
+ 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)
@@ -232,57 +228,21 @@ const string pretty_pv(Position& pos, int time, int depth,
namespace {
- Ambiguity move_ambiguity(const Position& pos, Move m) {
-
- MoveStack mlist[MOVES_MAX], *last;
- Move candidates[8];
- Square from = move_from(m);
- Square to = move_to(m);
- Piece pc = pos.piece_on(from);
- int matches = 0, f = 0, r = 0;
-
- // If there is only one piece 'pc' then move cannot be ambiguous
- if (pos.piece_count(pos.side_to_move(), type_of_piece(pc)) == 1)
- return AMBIGUITY_NONE;
-
- // Collect all legal moves of piece 'pc' with destination 'to'
- last = generate(pos, mlist);
- for (MoveStack* cur = mlist; cur != last; cur++)
- if (move_to(cur->move) == to && pos.piece_on(move_from(cur->move)) == pc)
- candidates[matches++] = cur->move;
-
- if (matches == 1)
- return AMBIGUITY_NONE;
-
- for (int i = 0; i < matches; i++)
- {
- if (square_file(move_from(candidates[i])) == square_file(from))
- f++;
-
- if (square_rank(move_from(candidates[i])) == square_rank(from))
- r++;
- }
-
- return f == 1 ? AMBIGUITY_FILE : r == 1 ? AMBIGUITY_RANK : AMBIGUITY_BOTH;
- }
-
-
const string time_string(int millisecs) {
const int MSecMinute = 1000 * 60;
const int MSecHour = 1000 * 60 * 60;
- std::stringstream s;
- s << std::setfill('0');
-
int hours = millisecs / MSecHour;
- int minutes = (millisecs - hours * MSecHour) / MSecMinute;
- int seconds = (millisecs - hours * MSecHour - minutes * MSecMinute) / 1000;
+ int minutes = (millisecs % MSecHour) / MSecMinute;
+ int seconds = ((millisecs % MSecHour) % MSecMinute) / 1000;
+
+ std::stringstream s;
if (hours)
s << hours << ':';
- s << std::setw(2) << minutes << ':' << std::setw(2) << seconds;
+ s << std::setfill('0') << std::setw(2) << minutes << ':' << std::setw(2) << seconds;
return s.str();
}
@@ -296,13 +256,8 @@ namespace {
else if (v <= -VALUE_MATE + 200)
s << "-#" << (VALUE_MATE + v) / 2;
else
- {
- float floatScore = float(v) / float(PawnValueMidgame);
- if (v >= 0)
- s << '+';
+ s << std::setprecision(2) << std::fixed << std::showpos << float(v) / PawnValueMidgame;
- s << std::setprecision(2) << std::fixed << floatScore;
- }
return s.str();
}
}