HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-24 02:57:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the use of classical eval

Browse Source 
no benefit of the fallback term (exercised rarely).
Cleanup the associated code.

passed STC
https://tests.stockfishchess.org/tests/view/62f62c2b6f0a08af9f776367
LLR: 2.96 (-2.94,2.94) <-1.75,0.25>
Total: 67832 W: 18334 L: 18148 D: 31350
Ptnml(0-2): 369, 7171, 18609, 7439, 328

passed LTC
https://tests.stockfishchess.org/tests/view/62f68beb6f0a08af9f77710e
LLR: 2.94 (-2.94,2.94) <-1.75,0.25>
Total: 104664 W: 28363 L: 28233 D: 48068
Ptnml(0-2): 169, 10162, 31511, 10350, 140

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

Bench: 6079565
This commit is contained in:
Joost VandeVondele
2022-08-12 12:31:49 +02:00
parent 5f290352cd
commit 15ac117ac4
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/evaluate.cpp
View File

@@ -1053,21 +1053,16 @@ Value Eval::evaluate(const Position& pos, int* complexity) {
Value v; Value v;
Color stm = pos.side_to_move(); Color stm = pos.side_to_move();
Value psq = pos.psq_eg_stm(); Value psq = pos.psq_eg_stm();
// Deciding between classical and NNUE eval (~10 Elo): for high PSQ imbalance we use classical,
// but we switch to NNUE during long shuffling or with high material on the board.
bool useClassical = (pos.count<ALL_PIECES>() > 7)
&& abs(psq) * 5 > (856 + pos.non_pawn_material() / 64) * (10 + pos.rule50_count());
// Deciding between classical and NNUE eval (~10 Elo): for high PSQ imbalance we use classical, // Deciding between classical and NNUE eval: for high PSQ imbalance we use classical,
// but we switch to NNUE during long shuffling or with high material on the board. // but we switch to NNUE during long shuffling or with high material on the board.
if (!useNNUE || useClassical) bool useClassical = !useNNUE ||
{ ((pos.count<ALL_PIECES>() > 7)
&& abs(psq) * 5 > (856 + pos.non_pawn_material() / 64) * (10 + pos.rule50_count()));
if (useClassical)
v = Evaluation<NO_TRACE>(pos).value(); v = Evaluation<NO_TRACE>(pos).value();
useClassical = abs(v) >= 297; else
}
// If result of a classical evaluation is much lower than threshold fall back to NNUE
if (useNNUE && !useClassical)
{ {
int nnueComplexity; int nnueComplexity;
int scale = 1064 + 106 * pos.non_pawn_material() / 5120; int scale = 1064 + 106 * pos.non_pawn_material() / 5120;