mirror of
https://github.com/HChaZZY/Stockfish.git
synced 2025-12-23 02:27:00 +08:00
simplified and increased threshold to switch between NNUE and classical
STC https://tests.stockfishchess.org/tests/view/5f2deb1661e3b6af6488200f LLR: 2.96 (-2.94,2.94) {-1.50,0.50} Total: 10376 W: 1481 L: 1359 D: 7536 Ptnml(0-2): 91, 953, 2981, 1069, 94 LTC: https://tests.stockfishchess.org/html/live_elo.html?5f2e0a0461e3b6af64882019 LLR: 2.99 (-2.94,2.94) {-1.50,0.50} Total: 5040 W: 375 L: 315 D: 4350 Ptnml(0-2): 7, 263, 1926, 311, 13 closes https://github.com/official-stockfish/Stockfish/pull/2934 Bench: 4067325
This commit is contained in:
committed by
Joost VandeVondele
parent
910f779eb1
commit
23ecf3d5c6
@@ -110,7 +110,7 @@ namespace {
|
|||||||
constexpr Value LazyThreshold1 = Value(1400);
|
constexpr Value LazyThreshold1 = Value(1400);
|
||||||
constexpr Value LazyThreshold2 = Value(1300);
|
constexpr Value LazyThreshold2 = Value(1300);
|
||||||
constexpr Value SpaceThreshold = Value(12222);
|
constexpr Value SpaceThreshold = Value(12222);
|
||||||
constexpr Value NNUEThreshold = Value(500);
|
constexpr Value NNUEThreshold = Value(520);
|
||||||
|
|
||||||
// KingAttackWeights[PieceType] contains king attack weights by piece type
|
// KingAttackWeights[PieceType] contains king attack weights by piece type
|
||||||
constexpr int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 81, 52, 44, 10 };
|
constexpr int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 81, 52, 44, 10 };
|
||||||
@@ -939,10 +939,9 @@ Value Eval::evaluate(const Position& pos) {
|
|||||||
|
|
||||||
if (Eval::useNNUE)
|
if (Eval::useNNUE)
|
||||||
{
|
{
|
||||||
Value balance = pos.non_pawn_material(WHITE) - pos.non_pawn_material(BLACK);
|
Value v = eg_value(pos.psq_score());
|
||||||
balance += 200 * (pos.count<PAWN>(WHITE) - pos.count<PAWN>(BLACK));
|
|
||||||
// Take NNUE eval only on balanced positions
|
// Take NNUE eval only on balanced positions
|
||||||
if (abs(balance) < NNUEThreshold)
|
if (abs(v) < NNUEThreshold)
|
||||||
return NNUE::evaluate(pos) + Tempo;
|
return NNUE::evaluate(pos) + Tempo;
|
||||||
}
|
}
|
||||||
return Evaluation<NO_TRACE>(pos).value();
|
return Evaluation<NO_TRACE>(pos).value();
|
||||||
|
|||||||
@@ -1134,7 +1134,7 @@ moves_loop: // When in check, search starts from here
|
|||||||
// Castling extension
|
// Castling extension
|
||||||
if (type_of(move) == CASTLING)
|
if (type_of(move) == CASTLING)
|
||||||
extension = 1;
|
extension = 1;
|
||||||
|
|
||||||
// Late irreversible move extension
|
// Late irreversible move extension
|
||||||
if ( move == ttMove
|
if ( move == ttMove
|
||||||
&& pos.rule50_count() > 80
|
&& pos.rule50_count() > 80
|
||||||
|
|||||||
Reference in New Issue
Block a user