const ButterflyHistory* mh,
const CapturePieceToHistory* cph,
const PieceToHistory** ch,
+ const PawnHistory* ph,
Move cm,
const Move* killers) :
pos(p),
mainHistory(mh),
captureHistory(cph),
continuationHistory(ch),
+ pawnHistory(ph),
ttMove(ttm),
refutations{{killers[0], 0}, {killers[1], 0}, {cm, 0}},
depth(d) {
const ButterflyHistory* mh,
const CapturePieceToHistory* cph,
const PieceToHistory** ch,
- Square rs) :
+ const PawnHistory* ph) :
pos(p),
mainHistory(mh),
captureHistory(cph),
continuationHistory(ch),
+ pawnHistory(ph),
ttMove(ttm),
- recaptureSquare(rs),
depth(d) {
assert(d <= 0);
// histories
m.value = 2 * (*mainHistory)[pos.side_to_move()][from_to(m)];
+ m.value += 2 * (*pawnHistory)[pawn_structure(pos)][pc][to];
m.value += 2 * (*continuationHistory[0])[pc][to];
m.value += (*continuationHistory[1])[pc][to];
m.value += (*continuationHistory[2])[pc][to] / 4;
+ (1 << 28);
else
m.value = (*mainHistory)[pos.side_to_move()][from_to(m)]
- + (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)];
+ + (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)]
+ + (*pawnHistory)[pawn_structure(pos)][pos.moved_piece(m)][to_sq(m)];
}
}
case GOOD_CAPTURE :
if (select<Next>([&]() {
- return pos.see_ge(*cur, Value(-cur->value))
- ?
- // Move losing capture to endBadCaptures to be tried later
- true
- : (*endBadCaptures++ = *cur, false);
+ // Move losing capture to endBadCaptures to be tried later
+ return pos.see_ge(*cur, Value(-cur->value)) ? true
+ : (*endBadCaptures++ = *cur, false);
}))
return *(cur - 1);
endMoves = generate<QUIETS>(pos, cur);
score<QUIETS>();
- partial_insertion_sort(cur, endMoves, -3000 * depth);
+ partial_insertion_sort(cur, endMoves, -1960 - 3130 * depth);
}
++stage;
return select<Next>([&]() { return pos.see_ge(*cur, threshold); });
case QCAPTURE :
- if (select<Next>(
- [&]() { return depth > DEPTH_QS_RECAPTURES || to_sq(*cur) == recaptureSquare; }))
+ if (select<Next>([]() { return true; }))
return *(cur - 1);
// If we did not find any move and we do not try checks, we have finished