/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 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
// Unary predicate used by std::partition to split positive values from remaining
// ones so as to sort the two sets separately, with the second sort delayed.
- inline bool has_positive_value(const ExtMove& ms) { return ms.value > 0; }
+ inline bool has_positive_value(const ExtMove& move) { return move.value > VALUE_ZERO; }
// Picks the best move in the range (begin, end) and moves it to the front.
// It's faster than sorting all the moves in advance when there are few
std::swap(*begin, *std::max_element(begin, end));
return begin;
}
-}
+} // namespace
/// Constructors of the MovePicker class. As arguments we pass information
followupmoves = fm;
ss = s;
- if (p.checkers())
+ if (pos.checkers())
stage = EVASION;
else
}
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- Square sq) : pos(p), history(h), cur(moves), end(moves) {
+ Square s) : pos(p), history(h), cur(moves), end(moves) {
assert(d <= DEPTH_ZERO);
- if (p.checkers())
+ if (pos.checkers())
stage = EVASION;
else if (d > DEPTH_QS_NO_CHECKS)
stage = QSEARCH_0;
else if (d > DEPTH_QS_RECAPTURES)
- {
stage = QSEARCH_1;
- // Skip TT move if is not a capture or a promotion. This avoids qsearch
- // tree explosion due to a possible perpetual check or similar rare cases
- // when TT table is full.
- if (ttm && !pos.capture_or_promotion(ttm))
- ttm = MOVE_NONE;
- }
else
{
stage = RECAPTURE;
- recaptureSquare = sq;
+ recaptureSquare = s;
ttm = MOVE_NONE;
}
{
m = it->move;
it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - type_of(pos.moved_piece(m));
-
- if (type_of(m) == PROMOTION)
- it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
+ - Value(type_of(pos.moved_piece(m)));
- else if (type_of(m) == ENPASSANT)
+ if (type_of(m) == ENPASSANT)
it->value += PieceValue[MG][PAWN];
+
+ else if (type_of(m) == PROMOTION)
+ it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
}
}
else if (pos.capture(m))
it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - type_of(pos.moved_piece(m)) + HistoryStats::Max;
+ - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
else
it->value = history[pos.moved_piece(m)][to_sq(m)];
}
case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
stage = STOP;
+ /* Fall through */
+
case STOP:
end = cur + 1; // Avoid another next_phase() call
return;
case KILLERS_S1:
move = (cur++)->move;
if ( move != MOVE_NONE
- && pos.pseudo_legal(move)
&& move != ttMove
+ && pos.pseudo_legal(move)
&& !pos.capture(move))
return move;
break;