const HistoryStats& history = pos.this_thread()->history;
- const CounterMoveStats* cmh = (ss-1)->counterMoves;
- const CounterMoveStats* fmh = (ss-2)->counterMoves;
- const CounterMoveStats* fmh2 = (ss-4)->counterMoves;
+ const CounterMoveStats& cmh = *(ss-1)->counterMoves;
+ const CounterMoveStats& fmh = *(ss-2)->counterMoves;
+ const CounterMoveStats& fm2 = *(ss-4)->counterMoves;
Color c = pos.side_to_move();
for (auto& m : *this)
- m.value = (cmh ? (*cmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
- + (fmh ? (*fmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
- + (fmh2 ? (*fmh2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ m.value = cmh[pos.moved_piece(m)][to_sq(m)]
+ + fmh[pos.moved_piece(m)][to_sq(m)]
+ + fm2[pos.moved_piece(m)][to_sq(m)]
+ history.get(c, m);
}
/// left. It picks the move with the biggest value from a list of generated moves
/// taking care not to return the ttMove if it has already been searched.
-Move MovePicker::next_move() {
+Move MovePicker::next_move(bool skipQuiets) {
Move move;
++stage;
case QUIET:
- while (cur < endMoves)
+ while ( cur < endMoves
+ && (!skipQuiets || cur->value >= VALUE_ZERO))
{
move = *cur++;
+
if ( move != ttMove
&& move != ss->killers[0]
&& move != ss->killers[1]