Revert opponent time advantage logic

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 8f3ef1cd78d4711de49065bf82ccb36d3c80a171..3e396af3032d6e11c2329d15763853f0f4f85b8f 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -778,7 +778,7 @@ namespace {
             while (b)
             {
                 Square from, to = pop_1st_bit(&b);
-                if (!(escapeSquares & ~queen_attacks_bb(to, occ & clear_mask_bb(s))))
+                if (!(escapeSquares & ~queen_attacks_bb(to, occ & ClearMaskBB[s])))
                 {
                     // We have a mate, unless the queen is pinned or there
                     // is an X-ray attack through the queen.
@@ -787,8 +787,8 @@ namespace {
                         from = p.piece_list(them, QUEEN, i);
                         if (    bit_is_set(p.piece_attacks<QUEEN>(from), to)
                             && !bit_is_set(p.pinned_pieces(them), from)
-                            && !(rook_attacks_bb(to, occ & clear_mask_bb(from)) & p.rooks_and_queens(us))
-                            && !(rook_attacks_bb(to, occ & clear_mask_bb(from)) & p.rooks_and_queens(us)))
+                            && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.rooks_and_queens(us))
+                            && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.rooks_and_queens(us)))
                             
                             ei.mateThreat[them] = make_move(from, to);
                     }
@@ -1120,13 +1120,7 @@ namespace {
 
     ev = apply_scale_factor(ev, sf[(ev > Value(0) ? WHITE : BLACK)]);
 
-    // Linearized sigmoid interpolator
-    int sph = int(ph);
-    sph -= (64 - sph) / 4;
-    sph = Min(PHASE_MIDGAME, Max(PHASE_ENDGAME, sph));
-
-    Value result = Value(int((mv * sph + ev * (128 - sph)) / 128));
-
+    Value result = Value(int((mv * ph + ev * (128 - ph)) / 128));
     return Value(int(result) & ~(GrainSize - 1));
   }