HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-06 10:53:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify MovePicker::score() by using piece types for clarity

Browse Source 
STC https://tests.stockfishchess.org/tests/view/680ed6cc3629b02d74b160bf
LLR: 2.93 (-2.94,2.94) <-1.75,0.25>
Total: 200128 W: 51838 L: 51802 D: 96488
Ptnml(0-2): 457, 19956, 59247, 19902, 502

closes https://github.com/official-stockfish/Stockfish/pull/6039

No functional change
This commit is contained in:
mstembera
2025-04-27 18:13:58 -07:00
committed by Disservin
parent b73c8982df
commit 7afd9e859d
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/movepick.cpp
View File

@@ -126,20 +126,20 @@ void MovePicker::score() {
static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type");
[[maybe_unused]] Bitboard threatenedPieces, threatByLesser[4];
[[maybe_unused]] Bitboard threatenedPieces, threatByLesser[QUEEN + 1];
if constexpr (Type == QUIETS)
{
Color us = pos.side_to_move();
threatByLesser[0] = threatByLesser[1] = pos.attacks_by<PAWN>(~us);
threatByLesser[2] =
pos.attacks_by<KNIGHT>(~us) | pos.attacks_by<BISHOP>(~us) | threatByLesser[0];
threatByLesser[3] = pos.attacks_by<ROOK>(~us) | threatByLesser[2];
threatByLesser[KNIGHT] = threatByLesser[BISHOP] = pos.attacks_by<PAWN>(~us);
threatByLesser[ROOK] =
pos.attacks_by<KNIGHT>(~us) | pos.attacks_by<BISHOP>(~us) | threatByLesser[KNIGHT];
threatByLesser[QUEEN] = pos.attacks_by<ROOK>(~us) | threatByLesser[ROOK];
// Pieces threatened by pieces of lesser material value
threatenedPieces = (pos.pieces(us, QUEEN) & threatByLesser[3])
| (pos.pieces(us, ROOK) & threatByLesser[2])
| (pos.pieces(us, KNIGHT, BISHOP) & threatByLesser[0]);
threatenedPieces = (pos.pieces(us, QUEEN) & threatByLesser[QUEEN])
| (pos.pieces(us, ROOK) & threatByLesser[ROOK])
| (pos.pieces(us, KNIGHT, BISHOP) & threatByLesser[KNIGHT]);
}
for (auto& m : *this)
@@ -173,12 +173,11 @@ void MovePicker::score() {
// penalty for moving to a square threatened by a lesser piece
// or bonus for escaping an attack by a lesser piece.
constexpr int bonus[4] = {144, 144, 256, 517};
if (KNIGHT <= pt && pt <= QUEEN)
{
auto i = pt - 2;
int v = (threatByLesser[i] & to ? -95 : 100 * bool(threatByLesser[i] & from));
m.value += bonus[i] * v;
static constexpr int bonus[QUEEN + 1] = {0, 0, 144, 144, 256, 517};
int v = (threatByLesser[pt] & to ? -95 : 100 * bool(threatByLesser[pt] & from));
m.value += bonus[pt] * v;
}
if (ply < LOW_PLY_HISTORY_SIZE)