Hopefully more clear.
No functional change.
namespace {
enum Stages {
namespace {
enum Stages {
- MAIN_SEARCH, CAPTURES_S1, KILLERS_S1, QUIETS_1_S1, QUIETS_2_S1, BAD_CAPTURES_S1,
- EVASION, EVASIONS_S2,
- QSEARCH_0, CAPTURES_S3, QUIET_CHECKS_S3,
- QSEARCH_1, CAPTURES_S4,
- PROBCUT, CAPTURES_S5,
- RECAPTURE, CAPTURES_S6,
+ MAIN_SEARCH, GOOD_CAPTURES, KILLERS, GOOD_QUIETS, BAD_QUIETS, BAD_CAPTURES,
+ EVASION, ALL_EVASIONS,
+ QSEARCH_WITH_CHECKS, QCAPTURES_1, CHECKS,
+ QSEARCH_WITHOUT_CHECKS, QCAPTURES_2,
+ PROBCUT, PROBCUT_CAPTURES,
+ RECAPTURE, RECAPTURES,
stage = EVASION;
else if (d > DEPTH_QS_NO_CHECKS)
stage = EVASION;
else if (d > DEPTH_QS_NO_CHECKS)
+ stage = QSEARCH_WITH_CHECKS;
else if (d > DEPTH_QS_RECAPTURES)
else if (d > DEPTH_QS_RECAPTURES)
+ stage = QSEARCH_WITHOUT_CHECKS;
- case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6:
+ case GOOD_CAPTURES: case QCAPTURES_1: case QCAPTURES_2:
+ case PROBCUT_CAPTURES: case RECAPTURES:
endMoves = generate<CAPTURES>(pos, moves);
score<CAPTURES>();
break;
endMoves = generate<CAPTURES>(pos, moves);
score<CAPTURES>();
break;
cur = killers;
endMoves = cur + 2;
cur = killers;
endMoves = cur + 2;
*endMoves++ = countermove;
break;
*endMoves++ = countermove;
break;
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;
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;
cur = endMoves;
endMoves = endQuiets;
if (depth >= 3 * ONE_PLY)
insertion_sort(cur, endMoves);
break;
cur = endMoves;
endMoves = endQuiets;
if (depth >= 3 * ONE_PLY)
insertion_sort(cur, endMoves);
break;
// Just pick them in reverse order to get MVV/LVA ordering
cur = moves + MAX_MOVES - 1;
endMoves = endBadCaptures;
break;
// Just pick them in reverse order to get MVV/LVA ordering
cur = moves + MAX_MOVES - 1;
endMoves = endBadCaptures;
break;
endMoves = generate<EVASIONS>(pos, moves);
if (endMoves - moves > 1)
score<EVASIONS>();
break;
endMoves = generate<EVASIONS>(pos, moves);
if (endMoves - moves > 1)
score<EVASIONS>();
break;
endMoves = generate<QUIET_CHECKS>(pos, moves);
break;
endMoves = generate<QUIET_CHECKS>(pos, moves);
break;
- case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
+ case EVASION: case QSEARCH_WITH_CHECKS: case QSEARCH_WITHOUT_CHECKS:
+ case PROBCUT: case RECAPTURE:
stage = STOP;
/* Fall through */
stage = STOP;
/* Fall through */
- case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT:
+ case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS:
+ case QSEARCH_WITHOUT_CHECKS: case PROBCUT:
move = pick_best(cur++, endMoves);
if (move != ttMove)
{
move = pick_best(cur++, endMoves);
if (move != ttMove)
{
move = *cur++;
if ( move != MOVE_NONE
&& move != ttMove
move = *cur++;
if ( move != MOVE_NONE
&& move != ttMove
- case QUIETS_1_S1: case QUIETS_2_S1:
+ case GOOD_QUIETS: case BAD_QUIETS:
move = *cur++;
if ( move != ttMove
&& move != killers[0]
move = *cur++;
if ( move != ttMove
&& move != killers[0]
- case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4:
+ case ALL_EVASIONS: case QCAPTURES_1: case QCAPTURES_2:
move = pick_best(cur++, endMoves);
if (move != ttMove)
return move;
break;
move = pick_best(cur++, endMoves);
if (move != ttMove)
return move;
break;
move = pick_best(cur++, endMoves);
if (move != ttMove && pos.see(move) > captureThreshold)
return move;
break;
move = pick_best(cur++, endMoves);
if (move != ttMove && pos.see(move) > captureThreshold)
return move;
break;
move = pick_best(cur++, endMoves);
if (to_sq(move) == recaptureSquare)
return move;
break;
move = pick_best(cur++, endMoves);
if (to_sq(move) == recaptureSquare)
return move;
break;
move = *cur++;
if (move != ttMove)
return move;
move = *cur++;
if (move != ttMove)
return move;