/// search captures, promotions and some checks) and about how important good
/// move ordering is at the current node.
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, Move* cm,
- Search::Stack* s, Value beta) : pos(p), history(h), depth(d) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
+ Move* cm, Search::Stack* s) : pos(p), history(h), depth(d) {
assert(d > DEPTH_ZERO);
- captureThreshold = 0;
cur = end = moves;
endBadCaptures = moves + MAX_MOVES - 1;
countermoves = cm;
stage = EVASION;
else
- {
stage = MAIN_SEARCH;
- // Consider sligtly negative captures as good if at low depth and far from beta
- 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->staticEval > beta)
- captureThreshold = beta - ss->staticEval;
- }
-
- ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
end += (ttMove != MOVE_NONE);
}
// 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.is_capture_or_promotion(ttm))
+ if (ttm && !pos.capture_or_promotion(ttm))
ttm = MOVE_NONE;
}
else
ttm = MOVE_NONE;
}
- ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
end += (ttMove != MOVE_NONE);
}
// In ProbCut we generate only captures better than parent's captured piece
captureThreshold = PieceValue[MG][pt];
- ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
- if (ttMove && (!pos.is_capture(ttMove) || pos.see(ttMove) <= captureThreshold))
+ if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold))
ttMove = MOVE_NONE;
end += (ttMove != MOVE_NONE);
{
m = it->move;
it->score = PieceValue[MG][pos.piece_on(to_sq(m))]
- - type_of(pos.piece_moved(m));
+ - type_of(pos.moved_piece(m));
if (type_of(m) == PROMOTION)
it->score += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
for (ExtMove* it = moves; it != end; ++it)
{
m = it->move;
- it->score = history[pos.piece_moved(m)][to_sq(m)];
+ it->score = history[pos.moved_piece(m)][to_sq(m)];
}
}
if ((seeScore = pos.see_sign(m)) < 0)
it->score = seeScore - HistoryStats::Max; // At the bottom
- else if (pos.is_capture(m))
+ else if (pos.capture(m))
it->score = PieceValue[MG][pos.piece_on(to_sq(m))]
- - type_of(pos.piece_moved(m)) + HistoryStats::Max;
+ - type_of(pos.moved_piece(m)) + HistoryStats::Max;
else
- it->score = history[pos.piece_moved(m)][to_sq(m)];
+ it->score = history[pos.moved_piece(m)][to_sq(m)];
}
}
killers[2].move = killers[3].move = MOVE_NONE;
// Be sure countermoves are different from killers
- for (int i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
if (countermoves[i] != cur->move && countermoves[i] != (cur+1)->move)
(end++)->move = countermoves[i];
switch (stage) {
case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT:
- cur++;
+ ++cur;
return ttMove;
case CAPTURES_S1:
move = pick_best(cur++, end)->move;
if (move != ttMove)
{
- assert(captureThreshold <= 0); // Otherwise we cannot use see_sign()
-
- if (pos.see_sign(move) >= captureThreshold)
+ if (pos.see_sign(move) >= 0)
return move;
// Losing capture, move it to the tail of the array
case KILLERS_S1:
move = (cur++)->move;
if ( move != MOVE_NONE
- && pos.is_pseudo_legal(move)
+ && pos.pseudo_legal(move)
&& move != ttMove
- && !pos.is_capture(move))
+ && !pos.capture(move))
return move;
break;