-template<>
-void MovePicker::score<QUIETS>() {
-
- Move m;
-
- for (ExtMove* it = moves; it != end; ++it)
- {
- m = it->move;
- it->value = history[pos.moved_piece(m)][to_sq(m)];
- }
-}
-
-template<>
-void MovePicker::score<EVASIONS>() {
- // Try good captures ordered by MVV/LVA, then non-captures if destination square
- // is not under attack, ordered by history value, then bad-captures and quiet
- // moves with a negative SEE. This last group is ordered by the SEE value.
- Move m;
- Value see;
-
- for (ExtMove* it = moves; it != end; ++it)
- {
- m = it->move;
- if ((see = pos.see_sign(m)) < VALUE_ZERO)
- it->value = see - HistoryStats::Max; // At the bottom
-
- else if (pos.capture(m))
- it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
- else
- it->value = history[pos.moved_piece(m)][to_sq(m)];
- }
-}
-
-
-/// generate_next_stage() generates, scores and sorts the next bunch of moves,
-/// when there are no more moves to try for the current stage.
-
-void MovePicker::generate_next_stage() {
-
- cur = moves;
-
- switch (++stage) {
-
- case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6:
- end = generate<CAPTURES>(pos, moves);
- score<CAPTURES>();
- return;
-
- case KILLERS_S1:
- cur = killers;
- end = cur + 2;
-
- killers[0].move = ss->killers[0];
- killers[1].move = ss->killers[1];
- killers[2].move = killers[3].move = MOVE_NONE;
- killers[4].move = killers[5].move = MOVE_NONE;
-
- // Please note that following code is racy and could yield to rare (less
- // than 1 out of a million) duplicated entries in SMP case. This is harmless.
-
- // Be sure countermoves are different from killers
- for (int i = 0; i < 2; ++i)
- if ( countermoves[i] != (cur+0)->move
- && countermoves[i] != (cur+1)->move)
- (end++)->move = countermoves[i];
-
- // Be sure followupmoves are different from killers and countermoves
- for (int i = 0; i < 2; ++i)
- if ( followupmoves[i] != (cur+0)->move
- && followupmoves[i] != (cur+1)->move
- && followupmoves[i] != (cur+2)->move
- && followupmoves[i] != (cur+3)->move)
- (end++)->move = followupmoves[i];
- return;
-
- case QUIETS_1_S1:
- endQuiets = end = generate<QUIETS>(pos, moves);
- score<QUIETS>();
- end = std::partition(cur, end, has_positive_value);
- insertion_sort(cur, end);
- return;
-
- case QUIETS_2_S1:
- cur = end;
- end = endQuiets;
- if (depth >= 3 * ONE_PLY)
- insertion_sort(cur, end);
- return;
-
- case BAD_CAPTURES_S1:
- // Just pick them in reverse order to get MVV/LVA ordering
- cur = moves + MAX_MOVES - 1;
- end = endBadCaptures;
- return;
-
- case EVASIONS_S2:
- end = generate<EVASIONS>(pos, moves);
- if (end > moves + 1)
- score<EVASIONS>();
- return;
-
- case QUIET_CHECKS_S3:
- end = generate<QUIET_CHECKS>(pos, moves);
- return;
-
- case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
- stage = STOP;
- /* Fall through */
-
- case STOP:
- end = cur + 1; // Avoid another next_phase() call
- return;
-
- default:
- assert(false);
- }
+/// score() assigns a numerical value to each move in a list, used for sorting.
+/// Captures are ordered by Most Valuable Victim (MVV), preferring captures
+/// near our home rank. Quiets are ordered using the histories.
+template<GenType Type>
+void MovePicker::score() {
+
+ static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type");
+
+ for (auto& m : *this)
+ if (Type == CAPTURES)
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(200 * relative_rank(pos.side_to_move(), to_sq(m)));
+
+ else if (Type == QUIETS)
+ m.value = (*mainHistory)[pos.side_to_move()][from_to(m)]
+ + (*contHistory[0])[pos.moved_piece(m)][to_sq(m)]
+ + (*contHistory[1])[pos.moved_piece(m)][to_sq(m)]
+ + (*contHistory[3])[pos.moved_piece(m)][to_sq(m)];
+
+ else // Type == EVASIONS
+ {
+ if (pos.capture(m))
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m)));
+ else
+ m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] - (1 << 28);
+ }