- for (MoveStack* cur = moves; cur != lastMove; cur++)
- {
- m = cur->move;
- if (m == ttMoves[0].move)
- cur->score = 2 * HistoryMax;
- else if (!pos.square_is_empty(move_to(m)))
- {
- int seeScore = pos.see(m);
- cur->score = seeScore + (seeScore >= 0 ? HistoryMax : 0);
- } else
- cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
+ else if (pos.capture(m))
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
+ else
+ m.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:
+ endMoves = generate<CAPTURES>(pos, moves);
+ score<CAPTURES>();
+ break;
+
+ case KILLERS_S1:
+ cur = killers;
+ endMoves = cur + 2;
+
+ killers[0] = ss->killers[0];
+ killers[1] = ss->killers[1];
+ killers[2].move = MOVE_NONE;
+
+ // Be sure countermoves are different from killers
+ if ( countermove != killers[0]
+ && countermove != killers[1])
+ *endMoves++ = countermove;
+ break;
+
+ case QUIETS_1_S1:
+ endQuiets = 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 QUIETS_2_S1:
+ cur = endMoves;
+ endMoves = endQuiets;
+ if (depth >= 3 * ONE_PLY)
+ insertion_sort(cur, endMoves);
+ break;
+
+ case BAD_CAPTURES_S1:
+ // Just pick them in reverse order to get MVV/LVA ordering
+ cur = moves + MAX_MOVES - 1;
+ endMoves = endBadCaptures;
+ break;
+
+ case EVASIONS_S2:
+ endMoves = generate<EVASIONS>(pos, moves);
+ if (endMoves - moves > 1)
+ score<EVASIONS>();
+ break;
+
+ case QUIET_CHECKS_S3:
+ endMoves = generate<QUIET_CHECKS>(pos, moves);
+ break;
+
+ case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
+ stage = STOP;
+ /* Fall through */
+
+ case STOP:
+ endMoves = cur + 1; // Avoid another generate_next_stage() call
+ break;
+
+ default:
+ assert(false);