X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=73ffcfb053057a6a203674dff264702940f55110;hp=80bec8746f8bd8edd7bd6db869c9c5b31b439e90;hb=a98dee783582c84ca2647ca28daad0c9a13d1d35;hpb=3e38e61565c9ee6e3ff83dddfae22908bd2594b4 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 80bec874..73ffcfb0 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -29,7 +29,6 @@ #include "evaluate.h" #include "material.h" #include "pawns.h" -#include "scale.h" #include "thread.h" #include "ucioption.h" @@ -1075,7 +1074,9 @@ namespace { assert(eg_value(v) > -VALUE_INFINITE && eg_value(v) < VALUE_INFINITE); assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME); - Value ev = apply_scale_factor(eg_value(v), sf[(eg_value(v) > Value(0) ? WHITE : BLACK)]); + Value eg = eg_value(v); + ScaleFactor f = sf[eg > Value(0) ? WHITE : BLACK]; + Value ev = Value((eg * f) / int(SCALE_FACTOR_NORMAL)); int result = (mg_value(v) * ph + ev * (128 - ph)) / 128; return Value(result & ~(GrainSize - 1));