namespace {
enum Stages {
- MAIN_SEARCH, GOOD_CAPTURES, KILLERS, GOOD_QUIETS, BAD_QUIETS, BAD_CAPTURES,
+ MAIN_SEARCH, GOOD_CAPTURES, KILLERS, QUIET, BAD_CAPTURES,
EVASION, ALL_EVASIONS,
QSEARCH_WITH_CHECKS, QCAPTURES_1, CHECKS,
QSEARCH_WITHOUT_CHECKS, QCAPTURES_2,
/// search captures, promotions, and some checks) and how important good move
/// ordering is at the current node.
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- const CounterMoveStats& cmh, Move cm, Search::Stack* s)
- : pos(p), history(h), counterMoveHistory(&cmh), ss(s), countermove(cm), depth(d) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s)
+ : pos(p), ss(s), depth(d) {
assert(d > DEPTH_ZERO);
+ Square prevSq = to_sq((ss-1)->currentMove);
+ countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq];
+
stage = pos.checkers() ? EVASION : MAIN_SEARCH;
ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
endMoves += (ttMove != MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
- const HistoryStats& h, Square s)
- : pos(p), history(h), counterMoveHistory(nullptr) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s)
+ : pos(p) {
assert(d <= DEPTH_ZERO);
endMoves += (ttMove != MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Value th)
- : pos(p), history(h), counterMoveHistory(nullptr), threshold(th) {
+MovePicker::MovePicker(const Position& p, Move ttm, Value th)
+ : pos(p), threshold(th) {
assert(!pos.checkers());
template<>
void MovePicker::score<QUIETS>() {
+ const HistoryStats& history = pos.this_thread()->history;
+
+ const CounterMoveStats* cm = (ss-1)->counterMoves;
+ const CounterMoveStats* fm = (ss-2)->counterMoves;
+ const CounterMoveStats* f2 = (ss-4)->counterMoves;
+
for (auto& m : *this)
- m.value = history[pos.moved_piece(m)][to_sq(m)]
- + (*counterMoveHistory)[pos.moved_piece(m)][to_sq(m)];
+ m.value = history[pos.moved_piece(m)][to_sq(m)]
+ + (cm ? (*cm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ + (fm ? (*fm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ + (f2 ? (*f2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO);
}
template<>
// Try winning and equal captures ordered by MVV/LVA, then non-captures ordered
// by history value, then bad captures and quiet moves with a negative SEE ordered
// by SEE value.
+ const HistoryStats& history = pos.this_thread()->history;
Value see;
for (auto& m : *this)
endMoves = cur + 2 + (countermove != killers[0] && countermove != killers[1]);
break;
- case GOOD_QUIETS:
- endQuiets = endMoves = generate<QUIETS>(pos, moves);
+ case QUIET:
+ endMoves = generate<QUIETS>(pos, moves);
score<QUIETS>();
- endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; });
- insertion_sort(cur, endMoves);
- break;
-
- case BAD_QUIETS:
- cur = endMoves;
- endMoves = endQuiets;
- if (depth >= 3 * ONE_PLY)
+ if (depth < 3 * ONE_PLY)
+ {
+ ExtMove* goodQuiet = std::partition(cur, endMoves, [](const ExtMove& m)
+ { return m.value > VALUE_ZERO; });
+ insertion_sort(cur, goodQuiet);
+ } else
insertion_sort(cur, endMoves);
break;
return move;
break;
- case GOOD_QUIETS: case BAD_QUIETS:
+ case QUIET:
move = *cur++;
if ( move != ttMove
&& move != killers[0]