X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=46ebbb49920021d90b56ed4ea8422f7a85720fdb;hb=b25d68f6ee2d016cc0c14b076e79e6c44fdaea2a;hp=a1bcdd20420b145bbc1f8d2bbec30af449d78d6b;hpb=f972947492c513b7c0c4046058354b44a9ae9f04;p=stockfish
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index a1bcdd20..46ebbb49 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -16,23 +16,24 @@
along with this program. If not, see .
*/
+#include "evaluate.h"
+
#include
#include
+#include
#include
#include
-#include
#include
-#include
+#include
#include
-#include "bitboard.h"
-#include "evaluate.h"
+#include "incbin/incbin.h"
#include "misc.h"
+#include "nnue/evaluate_nnue.h"
+#include "position.h"
#include "thread.h"
-#include "timeman.h"
+#include "types.h"
#include "uci.h"
-#include "incbin/incbin.h"
-#include "nnue/evaluate_nnue.h"
// Macro to embed the default efficiently updatable neural network (NNUE) file
// data in the engine binary (using incbin.h, by Dale Weiler).
@@ -58,8 +59,6 @@ namespace Eval {
string currentEvalFileName = "None";
- static double to_cp(Value v) { return double(v) / UCI::NormalizeToPawnValue; }
-
/// NNUE::init() tries to load a NNUE network at startup time, or when the engine
/// receives a UCI command "setoption name EvalFile value nn-[a-z0-9]{12}.nnue"
/// The name of the NNUE network is always retrieved from the EvalFile option.
@@ -137,30 +136,54 @@ namespace Eval {
}
}
-/// evaluate() is the evaluator for the outer world. It returns a static
-/// evaluation of the position from the point of view of the side to move.
-Value Eval::evaluate(const Position& pos) {
+/// simple_eval() 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.
- assert(!pos.checkers());
+Value Eval::simple_eval(const Position& pos, Color c) {
+ return PawnValue * (pos.count(c) - pos.count(~c))
+ + (pos.non_pawn_material(c) - pos.non_pawn_material(~c));
+}
- Value v;
- Value psq = pos.psq_eg_stm();
- int nnueComplexity;
- int npm = pos.non_pawn_material() / 64;
+/// evaluate() is the evaluator for the outer world. It returns a static evaluation
+/// of the position from the point of view of the side to move.
- Color stm = pos.side_to_move();
- Value optimism = pos.this_thread()->optimism[stm];
+Value Eval::evaluate(const Position& pos) {
- Value nnue = NNUE::evaluate(pos, true, &nnueComplexity);
+ assert(!pos.checkers());
- // Blend optimism with nnue complexity and (semi)classical complexity
- optimism += optimism * (nnueComplexity + abs(psq - nnue)) / 512;
- v = (nnue * (945 + npm) + optimism * (150 + npm)) / 1024;
+ Value v;
+ Color stm = pos.side_to_move();
+ int shuffling = pos.rule50_count();
+ int simpleEval = simple_eval(pos, stm) + (int(pos.key() & 7) - 3);
+
+ bool lazy = abs(simpleEval) >= RookValue + KnightValue
+ + 16 * shuffling * shuffling
+ + abs(pos.this_thread()->bestValue)
+ + abs(pos.this_thread()->rootSimpleEval);
+
+ if (lazy)
+ v = Value(simpleEval);
+ else
+ {
+ int nnueComplexity;
+ Value nnue = NNUE::evaluate(pos, true, &nnueComplexity);
+
+ Value optimism = pos.this_thread()->optimism[stm];
+
+ // Blend optimism and eval with nnue complexity and material imbalance
+ optimism += optimism * (nnueComplexity + abs(simpleEval - nnue)) / 512;
+ nnue -= nnue * (nnueComplexity + abs(simpleEval - nnue)) / 32768;
+
+ int npm = pos.non_pawn_material() / 64;
+ v = ( nnue * (915 + npm + 9 * pos.count())
+ + optimism * (154 + npm + pos.count())) / 1024;
+ }
// Damp down the evaluation linearly when shuffling
- v = v * (200 - pos.rule50_count()) / 214;
+ v = v * (200 - shuffling) / 214;
// Guarantee evaluation does not hit the tablebase range
v = std::clamp(v, VALUE_TB_LOSS_IN_MAX_PLY + 1, VALUE_TB_WIN_IN_MAX_PLY - 1);
@@ -180,6 +203,7 @@ std::string Eval::trace(Position& pos) {
// Reset any global variable used in eval
pos.this_thread()->bestValue = VALUE_ZERO;
+ pos.this_thread()->rootSimpleEval = VALUE_ZERO;
pos.this_thread()->optimism[WHITE] = VALUE_ZERO;
pos.this_thread()->optimism[BLACK] = VALUE_ZERO;
@@ -192,11 +216,11 @@ std::string Eval::trace(Position& pos) {
Value v;
v = NNUE::evaluate(pos, false);
v = pos.side_to_move() == WHITE ? v : -v;
- ss << "NNUE evaluation " << to_cp(v) << " (white side)\n";
+ ss << "NNUE evaluation " << 0.01 * UCI::to_cp(v) << " (white side)\n";
v = evaluate(pos);
v = pos.side_to_move() == WHITE ? v : -v;
- ss << "Final evaluation " << to_cp(v) << " (white side)";
+ ss << "Final evaluation " << 0.01 * UCI::to_cp(v) << " (white side)";
ss << " [with scaled NNUE, ...]";
ss << "\n";