/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 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
/// that the move is a legal move from the position. The return value is
/// a string containing the move in short algebraic notation.
-const string move_to_san(const Position& pos, Move m) {
+const string move_to_san(Position& pos, Move m) {
assert(pos.is_ok());
assert(move_is_ok(m));
san += "x";
}
san += square_to_string(move_to(m));
- if (move_promotion(m))
+ if (move_is_promotion(m))
{
san += '=';
- san += piece_type_to_char(move_promotion(m), true);
+ san += piece_type_to_char(move_promotion_piece(m), true);
}
}
// Is the move check? We don't use pos.move_is_check(m) here, because
// Position::move_is_check doesn't detect all checks (not castling moves,
// promotions and en passant captures).
StateInfo st;
- Position p(pos);
- p.do_move(m, st);
- if (p.is_check())
- san += p.is_mate()? "#" : "+";
+ pos.do_move(m, st);
+ if (pos.is_check())
+ san += pos.is_mate() ? "#" : "+";
+ pos.undo_move(m);
return san;
}
assert(pos.is_ok());
- MovePicker mp = MovePicker(pos, false, MOVE_NONE, OnePly, H);
+ MovePicker mp = MovePicker(pos, MOVE_NONE, OnePly, H);
+ Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
// Castling moves
if (movestr == "O-O-O" || movestr == "O-O-O+")
{
Move m;
while ((m = mp.get_next_move()) != MOVE_NONE)
- if (move_is_long_castle(m) && pos.pl_move_is_legal(m))
+ if (move_is_long_castle(m) && pos.pl_move_is_legal(m, pinned))
return m;
return MOVE_NONE;
{
Move m;
while ((m = mp.get_next_move()) != MOVE_NONE)
- if (move_is_short_castle(m) && pos.pl_move_is_legal(m))
+ if (move_is_short_castle(m) && pos.pl_move_is_legal(m, pinned))
return m;
return MOVE_NONE;
while ((m = mp.get_next_move()) != MOVE_NONE)
if ( pos.type_of_piece_on(move_from(m)) == pt
&& move_to(m) == to
- && move_promotion(m) == promotion
+ && move_promotion_piece(m) == promotion
&& (fromFile == FILE_NONE || fromFile == square_file(move_from(m)))
&& (fromRank == RANK_NONE || fromRank == square_rank(move_from(m))))
{
/// when the UCI parameter "Use Search Log" is "true").
const string pretty_pv(const Position& pos, int time, int depth,
- uint64_t nodes, Value score, Move pv[]) {
+ uint64_t nodes, Value score, ValueType type, Move pv[]) {
std::stringstream s;
// Depth
s << std::setw(2) << depth << " ";
// Score
- s << std::setw(8) << score_string(score);
+ s << ((type == VALUE_TYPE_LOWER)? ">" : ((type == VALUE_TYPE_UPPER)? "<" : " "));
+ s << std::setw(7) << score_string(score);
// Time
s << std::setw(8) << time_string(time) << " ";
if (type_of_piece(pc) == KING)
return AMBIGUITY_NONE;
- MovePicker mp = MovePicker(pos, false, MOVE_NONE, OnePly, H);
+ MovePicker mp = MovePicker(pos, MOVE_NONE, OnePly, H);
+ Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
Move mv, moveList[8];
int n = 0;
while ((mv = mp.get_next_move()) != MOVE_NONE)
- if (move_to(mv) == to && pos.piece_on(move_from(mv)) == pc && pos.pl_move_is_legal(mv))
+ if (move_to(mv) == to && pos.piece_on(move_from(mv)) == pc && pos.pl_move_is_legal(mv, pinned))
moveList[n++] = mv;
if (n == 1)