/// 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 History& h, const Refutations& r,
- Search::Stack* s, Value beta) : pos(p), Hist(h), depth(d) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CountermovesStats& cm,
+ Search::Stack* s, Value beta) : pos(p), history(h), depth(d) {
assert(d > DEPTH_ZERO);
killers[0].move = ss->killers[0];
killers[1].move = ss->killers[1];
Square prevSq = to_sq((ss-1)->currentMove);
- killers[2].move = r[pos.piece_on(prevSq)][prevSq];
+ killers[2].move = cm[pos.piece_on(prevSq)][prevSq];
// Consider sligtly negative captures as good if at low depth and far from beta
if (ss && ss->staticEval < beta - PawnValueMg && d < 3 * ONE_PLY)
end += (ttMove != MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
- Square sq) : pos(p), Hist(h), cur(moves), end(moves) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
+ Square sq) : pos(p), history(h), cur(moves), end(moves) {
assert(d <= DEPTH_ZERO);
end += (ttMove != MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, const History& h, PieceType pt)
- : pos(p), Hist(h), cur(moves), end(moves) {
+MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt)
+ : pos(p), history(h), cur(moves), end(moves) {
assert(!pos.checkers());
for (MoveStack* it = moves; it != end; ++it)
{
m = it->move;
- it->score = Hist[pos.piece_moved(m)][to_sq(m)];
+ it->score = history[pos.piece_moved(m)][to_sq(m)];
}
}
{
m = it->move;
if ((seeScore = pos.see_sign(m)) < 0)
- it->score = seeScore - History::Max; // At the bottom
+ it->score = seeScore - HistoryStats::Max; // At the bottom
else if (pos.is_capture(m))
it->score = PieceValue[MG][pos.piece_on(to_sq(m))]
- - type_of(pos.piece_moved(m)) + History::Max;
+ - type_of(pos.piece_moved(m)) + HistoryStats::Max;
else
- it->score = Hist[pos.piece_moved(m)][to_sq(m)];
+ it->score = history[pos.piece_moved(m)][to_sq(m)];
}
}