std::string eval_file = std::string(Options["EvalFile"]);
if (useNNUE && eval_file_loaded != eval_file)
{
- std::cerr << "Use of NNUE evaluation, but the file " << eval_file << " was not loaded successfully. "
- << "These network evaluation parameters must be available, compatible with this version of the code. "
- << "The UCI option EvalFile might need to specify the full path, including the directory/folder name, to the file." << std::endl;
+ UCI::OptionsMap defaults;
+ UCI::init(defaults);
+
+ std::cerr << "NNUE evaluation used, but the network file " << eval_file << " was not loaded successfully. "
+ << "These network evaluation parameters must be available, and compatible with this version of the code. "
+ << "The UCI option EvalFile might need to specify the full path, including the directory/folder name, to the file. "
+ << "The default net can be downloaded from: https://tests.stockfishchess.org/api/nn/"+std::string(defaults["EvalFile"]) << std::endl;
std::exit(EXIT_FAILURE);
}
constexpr Value LazyThreshold1 = Value(1400);
constexpr Value LazyThreshold2 = Value(1300);
constexpr Value SpaceThreshold = Value(12222);
- constexpr Value NNUEThreshold = Value(500);
+ constexpr Value NNUEThreshold = Value(575);
// KingAttackWeights[PieceType] contains king attack weights by piece type
constexpr int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 81, 52, 44, 10 };
// Side to move point of view
v = (pos.side_to_move() == WHITE ? v : -v) + Tempo;
- // Damp down the evaluation linearly when shuffling
- v = v * (100 - pos.rule50_count()) / 100;
-
return v;
}
Value Eval::evaluate(const Position& pos) {
- if (Eval::useNNUE)
- {
- Value balance = pos.non_pawn_material(WHITE) - pos.non_pawn_material(BLACK);
- balance += 200 * (pos.count<PAWN>(WHITE) - pos.count<PAWN>(BLACK));
- // Take NNUE eval only on balanced positions
- if (abs(balance) < NNUEThreshold)
- return NNUE::evaluate(pos) + Tempo;
- }
- return Evaluation<NO_TRACE>(pos).value();
+ bool classical = !Eval::useNNUE
+ || abs(eg_value(pos.psq_score())) >= NNUEThreshold * (16 + pos.rule50_count()) / 16;
+ Value v = classical ? Evaluation<NO_TRACE>(pos).value()
+ : NNUE::evaluate(pos) * 5 / 4 + Tempo;
+
+ // Damp down the evaluation linearly when shuffling
+ v = v * (100 - pos.rule50_count()) / 100;
+
+ // Guarantee evalution outside of TB range
+ v = Utility::clamp(v, VALUE_TB_LOSS_IN_MAX_PLY + 1, VALUE_TB_WIN_IN_MAX_PLY - 1);
+
+ return v;
}
/// trace() is like evaluate(), but instead of returning a value, it returns