/// ordering is at the current node.
/// MovePicker constructor for the main search
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh,
- const CapturePieceToHistory* cph, const PieceToHistory** ch, Move cm, Move* killers)
- : pos(p), mainHistory(mh), captureHistory(cph), continuationHistory(ch),
- refutations{{killers[0], 0}, {killers[1], 0}, {cm, 0}}, depth(d) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, const LowPlyHistory* lp,
+ const CapturePieceToHistory* cph, const PieceToHistory** ch, Move cm, Move* killers, int pl)
+ : pos(p), mainHistory(mh), lowPlyHistory(lp), captureHistory(cph), continuationHistory(ch),
+ ttMove(ttm), refutations{{killers[0], 0}, {killers[1], 0}, {cm, 0}}, depth(d), ply(pl) {
assert(d > 0);
- stage = pos.checkers() ? EVASION_TT : MAIN_TT;
- ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
- stage += (ttMove == MOVE_NONE);
+ stage = (pos.checkers() ? EVASION_TT : MAIN_TT) +
+ !(ttm && pos.pseudo_legal(ttm));
}
/// MovePicker constructor for quiescence search
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh,
const CapturePieceToHistory* cph, const PieceToHistory** ch, Square rs)
- : pos(p), mainHistory(mh), captureHistory(cph), continuationHistory(ch), recaptureSquare(rs), depth(d) {
+ : pos(p), mainHistory(mh), captureHistory(cph), continuationHistory(ch), ttMove(ttm), recaptureSquare(rs), depth(d) {
assert(d <= 0);
- stage = pos.checkers() ? EVASION_TT : QSEARCH_TT;
- ttMove = ttm
- && (depth > DEPTH_QS_RECAPTURES || to_sq(ttm) == recaptureSquare)
- && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
- stage += (ttMove == MOVE_NONE);
+ stage = (pos.checkers() ? EVASION_TT : QSEARCH_TT) +
+ !(ttm && (depth > DEPTH_QS_RECAPTURES || to_sq(ttm) == recaptureSquare)
+ && pos.pseudo_legal(ttm));
}
/// MovePicker constructor for ProbCut: we generate captures with SEE greater
/// than or equal to the given threshold.
MovePicker::MovePicker(const Position& p, Move ttm, Value th, const CapturePieceToHistory* cph)
- : pos(p), captureHistory(cph), threshold(th) {
+ : pos(p), captureHistory(cph), ttMove(ttm), threshold(th) {
assert(!pos.checkers());
- stage = PROBCUT_TT;
- ttMove = ttm
- && pos.capture(ttm)
- && pos.pseudo_legal(ttm)
- && pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE;
- stage += (ttMove == MOVE_NONE);
+ stage = PROBCUT_TT + !(ttm && pos.capture(ttm)
+ && pos.pseudo_legal(ttm)
+ && pos.see_ge(ttm, threshold));
}
/// MovePicker::score() assigns a numerical value to each move in a list, used
+ 2 * (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)]
+ 2 * (*continuationHistory[1])[pos.moved_piece(m)][to_sq(m)]
+ 2 * (*continuationHistory[3])[pos.moved_piece(m)][to_sq(m)]
- + (*continuationHistory[5])[pos.moved_piece(m)][to_sq(m)];
+ + (*continuationHistory[5])[pos.moved_piece(m)][to_sq(m)]
+ + (ply < MAX_LPH ? std::min(4, depth / 3) * (*lowPlyHistory)[ply][from_to(m)] : 0);
else // Type == EVASIONS
{
case GOOD_CAPTURE:
if (select<Best>([&](){
- return pos.see_ge(*cur, Value(-55 * cur->value / 1024)) ?
+ return pos.see_ge(*cur, Value(-69 * cur->value / 1024)) ?
// Move losing capture to endBadCaptures to be tried later
true : (*endBadCaptures++ = *cur, false); }))
return *(cur - 1);