/// ordering is at the current node.
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh,
- Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) {
+ Move* cm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) {
assert(d > DEPTH_ZERO);
endBadCaptures = moves + MAX_MOVES - 1;
countermoves = cm;
- followupmoves = fm;
ss = s;
if (pos.checkers())
killers[0] = ss->killers[0];
killers[1] = ss->killers[1];
killers[2].move = killers[3].move = MOVE_NONE;
- killers[4].move = killers[5].move = MOVE_NONE;
- // In SMP case countermoves[] and followupmoves[] could have duplicated entries
+ // In SMP case countermoves[] could have duplicated entries
// in rare cases (less than 1 out of a million). This is harmless.
// Be sure countermoves and followupmoves are different from killers
if ( countermoves[i] != killers[0]
&& countermoves[i] != killers[1])
*endMoves++ = countermoves[i];
-
- for (int i = 0; i < 2; ++i)
- if ( followupmoves[i] != killers[0]
- && followupmoves[i] != killers[1]
- && followupmoves[i] != killers[2]
- && followupmoves[i] != killers[3])
- *endMoves++ = followupmoves[i];
break;
case QUIETS_1_S1:
&& move != killers[0]
&& move != killers[1]
&& move != killers[2]
- && move != killers[3]
- && move != killers[4]
- && move != killers[5])
+ && move != killers[3])
return move;
break;