Little timeman.cpp massage

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 80bec8746f8bd8edd7bd6db869c9c5b31b439e90..74e70fa2530cf6903b553e892ca95188b8484f65 100644 (file)
--- 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"
 
@@ -822,7 +821,7 @@ namespace {
                 // add all X-ray attacks by the rook or queen. Otherwise consider only
                 // the squares in the pawn's path attacked or occupied by the enemy.
                 if (   (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them))
-                    && (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them) & pos.attacks_from<QUEEN>(s)))
+                    && (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them) & pos.attacks_from<ROOK>(s)))
                     unsafeSquares = squaresToQueen;
                 else
                     unsafeSquares = squaresToQueen & (ei.attacked_by(Them) | pos.pieces_of_color(Them));
@@ -903,7 +902,7 @@ namespace {
 
             if (d < 0 || pathDefended)
             {
-                int mtg = RANK_8 - relative_rank(c, s);
+                int mtg = RANK_8 - relative_rank(c, s) - int(relative_rank(c, s) == RANK_2);
                 int blockerCount = count_1s_max_15(squares_in_front_of(c, s) & pos.occupied_squares());
                 mtg += blockerCount;
                 d += blockerCount;
@@ -1065,9 +1064,8 @@ namespace {
   }
 
 
-  // scale_by_game_phase() interpolates between a middle game and an endgame
-  // score, based on game phase.  It also scales the return value by a
-  // ScaleFactor array.
+  // scale_by_game_phase() interpolates between a middle game and an endgame score,
+  // based on game phase. It also scales the return value by a ScaleFactor array.
 
   Value scale_by_game_phase(const Score& v, Phase ph, const ScaleFactor sf[]) {
 
@@ -1075,7 +1073,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) / SCALE_FACTOR_NORMAL);
 
     int result = (mg_value(v) * ph + ev * (128 - ph)) / 128;
     return Value(result & ~(GrainSize - 1));