};
// Our insertion sort, guaranteed to be stable, as is needed
- void insertion_sort(MoveStack* begin, MoveStack* end)
+ void insertion_sort(ExtMove* begin, ExtMove* end)
{
- MoveStack tmp, *p, *q;
+ ExtMove tmp, *p, *q;
for (p = begin + 1; p < end; ++p)
{
// Unary predicate used by std::partition to split positive scores from remaining
// ones so to sort separately the two sets, and with the second sort delayed.
- inline bool has_positive_score(const MoveStack& ms) { return ms.score > 0; }
+ inline bool has_positive_score(const ExtMove& ms) { return ms.score > 0; }
// Picks and moves to the front the best move in the range [begin, end),
// it is faster than sorting all the moves in advance when moves are few, as
// normally are the possible captures.
- inline MoveStack* pick_best(MoveStack* begin, MoveStack* end)
+ inline ExtMove* pick_best(ExtMove* begin, ExtMove* end)
{
std::swap(*begin, *std::max_element(begin, end));
return begin;
captureThreshold = 0;
cur = end = moves;
endBadCaptures = moves + MAX_MOVES - 1;
+ countermoves = cm;
ss = s;
if (p.checkers())
{
phase = MAIN_SEARCH;
- killers[0].move = ss->killers[0];
- killers[1].move = ss->killers[1];
- killers[2].move = cm[0];
- killers[3].move = cm[1];
-
// Consider sligtly negative captures as good if at low depth and far from beta
- if (ss && ss->staticEval < beta - PawnValueMg && d < 3 * ONE_PLY)
+ if (ss->staticEval < beta - PawnValueMg && d < 3 * ONE_PLY)
captureThreshold = -PawnValueMg;
// Consider negative captures as good if still enough to reach beta
- else if (ss && ss->staticEval > beta)
+ else if (ss->staticEval > beta)
captureThreshold = beta - ss->staticEval;
}
// some SEE calls in case we get a cutoff (idea from Pablo Vazquez).
Move m;
- for (MoveStack* it = moves; it != end; ++it)
+ for (ExtMove* it = moves; it != end; ++it)
{
m = it->move;
it->score = PieceValue[MG][pos.piece_on(to_sq(m))]
Move m;
- for (MoveStack* it = moves; it != end; ++it)
+ for (ExtMove* it = moves; it != end; ++it)
{
m = it->move;
it->score = history[pos.piece_moved(m)][to_sq(m)];
Move m;
int seeScore;
- for (MoveStack* it = moves; it != end; ++it)
+ for (ExtMove* it = moves; it != end; ++it)
{
m = it->move;
if ((seeScore = pos.see_sign(m)) < 0)
cur = killers;
end = cur + 2;
- if ((cur+3)->move && (cur+3)->move == (cur+2)->move) // Due to a SMP race
- (cur+3)->move = MOVE_NONE;
+ killers[0].move = ss->killers[0];
+ killers[1].move = ss->killers[1];
+ killers[2].move = killers[3].move = MOVE_NONE;
// Be sure countermoves are different from killers
- if ((cur+2)->move != cur->move && (cur+2)->move != (cur+1)->move)
- end++;
+ for (int i = 0; i < 2; i++)
+ if (countermoves[i] != cur->move && countermoves[i] != (cur+1)->move)
+ (end++)->move = countermoves[i];
+
+ if (countermoves[1] && countermoves[1] == countermoves[0]) // Due to SMP races
+ killers[3].move = MOVE_NONE;
- if ((cur+3)->move != cur->move && (cur+3)->move != (cur+1)->move)
- (end++)->move = (cur+3)->move;
return;
case QUIETS_1_S1: