Applying changes by @linrock from official-stockfish#4915

mstembera · mstembera · commit 7accfa0152ee · 2023-12-13T22:29:49.000-08:00
bench: 1485861
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -75,7 +75,8 @@ void NNUE::init() {
 
     for (bool small : {false, true})
     {
-        std::string eval_file = std::string(Options[EvFiles[small]]);
+        std::string eval_file =
+          std::string(small ? EvalFileDefaultNameSmall : Options[EvFiles[small]]);
         if (eval_file.empty())
             eval_file = EvFileNames[small];
 
@@ -129,7 +130,8 @@ void NNUE::verify() {
 
     for (bool small : {false, true})
     {
-        std::string eval_file = std::string(Options[EvFiles[small]]);
+        std::string eval_file =
+          std::string(small ? EvalFileDefaultNameSmall : Options[EvFiles[small]]);
         if (eval_file.empty())
             eval_file = EvFileNames[small];
 
@@ -170,15 +172,12 @@ Value Eval::evaluate(const Position& pos) {
     int   shuffling  = pos.rule50_count();
     int   simpleEval = pos.simple_eval();
 
-    int lazyThresholdSimpleEval = 2300;
-    int lazyThresholdSmallNet   = 1100;
-
-    bool lazy = abs(simpleEval) > lazyThresholdSimpleEval;
+    bool lazy = abs(simpleEval) > 2300;
     if (lazy)
         v = Value(simpleEval);
     else
     {
-        bool smallNet = abs(simpleEval) > lazyThresholdSmallNet;
+        bool smallNet = abs(simpleEval) > 1100;
 
         int nnueComplexity;
 
diff --git a/src/position.h b/src/position.h
@@ -323,6 +323,9 @@ inline Value Position::non_pawn_material() const {
     return non_pawn_material(WHITE) + non_pawn_material(BLACK);
 }
 
+// Returns a static, purely materialistic evaluation of the position from
+// the point of view of the given color. It can be divided by PawnValue to get
+// an approximation of the material advantage on the board in terms of pawns.
 inline Value Position::simple_eval() const {
     return PawnValue * (count<PAWN>(sideToMove) - count<PAWN>(~sideToMove))
          + (non_pawn_material(sideToMove) - non_pawn_material(~sideToMove));
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
@@ -85,7 +85,6 @@ void init(OptionsMap& o) {
     o["Syzygy50MoveRule"] << Option(true);
     o["SyzygyProbeLimit"] << Option(7, 0, 7);
     o["EvalFile"] << Option(EvalFileDefaultNameBig, on_eval_file);
-    o["EvalFileSmall"] << Option(EvalFileDefaultNameSmall, on_eval_file);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,9 @@ inline Value Position::non_pawn_material() const {`
`323`	`323`	`return non_pawn_material(WHITE) + non_pawn_material(BLACK);`
`324`	`324`	`}`
`325`	`325`
	`326`	`+// Returns a static, purely materialistic evaluation of the position from`
	`327`	`+// the point of view of the given color. It can be divided by PawnValue to get`
	`328`	`+// an approximation of the material advantage on the board in terms of pawns.`
`326`	`329`	`inline Value Position::simple_eval() const {`
`327`	`330`	`return PawnValue * (count<PAWN>(sideToMove) - count<PAWN>(~sideToMove))`
`328`	`331`	`+ (non_pawn_material(sideToMove) - non_pawn_material(~sideToMove));`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ void init(OptionsMap& o) {`
`85`	`85`	`o["Syzygy50MoveRule"] << Option(true);`
`86`	`86`	`o["SyzygyProbeLimit"] << Option(7, 0, 7);`
`87`	`87`	`o["EvalFile"] << Option(EvalFileDefaultNameBig, on_eval_file);`
`88`		`- o["EvalFileSmall"] << Option(EvalFileDefaultNameSmall, on_eval_file);`
`89`	`88`	`}`
`90`	`89`
`91`	`90`