1
0
Fork 0

Merge branch 'official-stockfish:master' into feature/add_cpu_uci_command_and_runtime_info

pull/3602/head
JackWright347 2021-07-24 20:41:56 +02:00 committed by GitHub
commit 2c1b03c1f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -1090,7 +1090,7 @@ Value Eval::evaluate(const Position& pos) {
// Scale and shift NNUE for compatibility with search and classical evaluation
auto adjusted_NNUE = [&]()
{
int scale = 903
int scale = 883
+ 32 * pos.count<PAWN>()
+ 32 * pos.non_pawn_material() / 1024;
@ -1106,7 +1106,7 @@ Value Eval::evaluate(const Position& pos) {
// NNUE eval faster when shuffling or if the material on the board is high.
int r50 = pos.rule50_count();
Value psq = Value(abs(eg_value(pos.psq_score())));
bool classical = psq * 5 > (750 + pos.non_pawn_material() / 64) * (5 + r50);
bool classical = psq * 5 > (850 + pos.non_pawn_material() / 64) * (5 + r50);
v = classical ? Evaluation<NO_TRACE>(pos).value() // classical
: adjusted_NNUE(); // NNUE

View File

@ -39,7 +39,7 @@ namespace Eval {
// The default net name MUST follow the format nn-[SHA256 first 12 digits].nnue
// for the build process (profile-build and fishtest) to work. Do not change the
// name of the macro, as it is used in the Makefile.
#define EvalFileDefaultName "nn-9e3c6298299a.nnue"
#define EvalFileDefaultName "nn-76a8a7ffb820.nnue"
namespace NNUE {