STOP
};
- // Our insertion sort, which is guaranteed (and also needed) to be stable
+ // Our insertion sort, which is guaranteed to be stable, as it should be
void insertion_sort(ExtMove* begin, ExtMove* end)
{
ExtMove tmp, *p, *q;
}
}
- // Picks the best move in the range (begin, end) and moves it to the front.
- // It's faster than sorting all the moves in advance when there are few
- // moves e.g. possible captures.
- inline ExtMove* pick_best(ExtMove* begin, ExtMove* end)
+ // pick_best() finds the best move in the range (begin, end) and moves it to
+ // the front. It's faster than sorting all the moves in advance when there
+ // are few moves e.g. the possible captures.
+ inline Move pick_best(ExtMove* begin, ExtMove* end)
{
std::swap(*begin, *std::max_element(begin, end));
- return begin;
+ return *begin;
}
+
} // namespace
// has been picked up in pick_move_from_list(). This way we save some SEE
// calls in case we get a cutoff.
for (auto& m : *this)
- m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - Value(type_of(pos.moved_piece(m)))
- + (type_of(m) == ENPASSANT ? PieceValue[MG][PAWN] :
- type_of(m) == PROMOTION ? PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]
- : VALUE_ZERO);
+ if (type_of(m) == ENPASSANT)
+ m.value = PieceValue[MG][PAWN] - Value(PAWN);
+
+ else if (type_of(m) == PROMOTION)
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - Value(PAWN)
+ + PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
+ else
+ m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
+ - Value(type_of(pos.moved_piece(m)));
}
template<>
case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6:
endMoves = generate<CAPTURES>(pos, moves);
score<CAPTURES>();
- return;
+ break;
case KILLERS_S1:
cur = killers;
endMoves = cur + 2;
- killers[0].move = ss->killers[0];
- killers[1].move = ss->killers[1];
+ 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;
- // 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.
+ // In SMP case countermoves[] and followupmoves[] could have duplicated entries
+ // in rare cases (less than 1 out of a million). This is harmless.
- // Be sure countermoves are different from killers
+ // Be sure countermoves and followupmoves are different from killers
for (int i = 0; i < 2; ++i)
- if ( countermoves[i] != (cur+0)->move
- && countermoves[i] != (cur+1)->move)
- (endMoves++)->move = countermoves[i];
+ if ( countermoves[i] != killers[0]
+ && countermoves[i] != killers[1])
+ *endMoves++ = 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)
- (endMoves++)->move = followupmoves[i];
- return;
+ 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:
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);
- return;
+ break;
case QUIETS_2_S1:
cur = endMoves;
endMoves = endQuiets;
if (depth >= 3 * ONE_PLY)
insertion_sort(cur, endMoves);
- return;
+ break;
case BAD_CAPTURES_S1:
// Just pick them in reverse order to get MVV/LVA ordering
cur = moves + MAX_MOVES - 1;
endMoves = endBadCaptures;
- return;
+ break;
case EVASIONS_S2:
endMoves = generate<EVASIONS>(pos, moves);
- if (endMoves > moves + 1)
+ if (endMoves - moves > 1)
score<EVASIONS>();
- return;
+ break;
case QUIET_CHECKS_S3:
endMoves = generate<QUIET_CHECKS>(pos, moves);
- return;
+ break;
case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
stage = STOP;
/* Fall through */
case STOP:
- endMoves = cur + 1; // Avoid another next_phase() call
- return;
+ endMoves = cur + 1; // Avoid another generate_next_stage() call
+ break;
default:
assert(false);
return ttMove;
case CAPTURES_S1:
- move = pick_best(cur++, endMoves)->move;
+ move = pick_best(cur++, endMoves);
if (move != ttMove)
{
if (pos.see_sign(move) >= VALUE_ZERO)
return move;
// Losing capture, move it to the tail of the array
- (endBadCaptures--)->move = move;
+ *endBadCaptures-- = move;
}
break;
case KILLERS_S1:
- move = (cur++)->move;
+ move = *cur++;
if ( move != MOVE_NONE
&& move != ttMove
&& pos.pseudo_legal(move)
break;
case QUIETS_1_S1: case QUIETS_2_S1:
- move = (cur++)->move;
+ move = *cur++;
if ( move != ttMove
- && move != killers[0].move
- && move != killers[1].move
- && move != killers[2].move
- && move != killers[3].move
- && move != killers[4].move
- && move != killers[5].move)
+ && move != killers[0]
+ && move != killers[1]
+ && move != killers[2]
+ && move != killers[3]
+ && move != killers[4]
+ && move != killers[5])
return move;
break;
case BAD_CAPTURES_S1:
- return (cur--)->move;
+ return *cur--;
case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4:
- move = pick_best(cur++, endMoves)->move;
+ move = pick_best(cur++, endMoves);
if (move != ttMove)
return move;
break;
case CAPTURES_S5:
- move = pick_best(cur++, endMoves)->move;
+ move = pick_best(cur++, endMoves);
if (move != ttMove && pos.see(move) > captureThreshold)
return move;
break;
case CAPTURES_S6:
- move = pick_best(cur++, endMoves)->move;
+ move = pick_best(cur++, endMoves);
if (to_sq(move) == recaptureSquare)
return move;
break;
case QUIET_CHECKS_S3:
- move = (cur++)->move;
+ move = *cur++;
if (move != ttMove)
return move;
break;
projects / stockfish / blobdiff