X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=abf2673499ec8be4f0f5ea7a09ad63701ef4542c;hp=8f7c4875d47e9690ef5d77c5f3e7e0629782ddfc;hb=d7d2c1b7e31f5b680ebb44e2ffcbfc4bcb2aecfd;hpb=e4d3a15656ac5cf7b9687a5d755fc61c402207b7

diff --git a/src/search.cpp b/src/search.cpp
index 8f7c4875..abf26734 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1497,10 +1497,9 @@ namespace {
 
     // Do a "stand pat". If we are above beta by a good margin then
     // return immediately.
-    // FIXME: test with added condition 'allowNullmove || depth <= OnePly' and !value_is_mate(beta)
-    // FIXME: test with modified condition 'depth < RazorDepth'
     if (  !isCheck
-        && depth < SelectiveDepth
+        && allowNullmove
+        && depth < RazorDepth
         && staticValue - FutilityMargins[int(depth)] >= beta)
         return staticValue - FutilityMargins[int(depth)];
 
@@ -1630,36 +1629,6 @@ namespace {
       // Update current move
       movesSearched[moveCount++] = ss[ply].currentMove = move;
 
-      // Futility pruning for captures
-      // FIXME: test disabling 'Futility pruning for captures'
-      // FIXME: test with 'newDepth < RazorDepth'
-      Color them = opposite_color(pos.side_to_move());
-
-      if (   !isCheck
-          && newDepth < SelectiveDepth
-          && !dangerous
-          && pos.move_is_capture(move)
-          && !pos.move_is_check(move, ci)
-          && !move_is_promotion(move)
-          && move != ttMove
-          && !move_is_ep(move)
-          && (pos.type_of_piece_on(move_to(move)) != PAWN || !pos.pawn_is_passed(them, move_to(move)))) // Do not prune passed pawn captures
-      {
-          int preFutilityValueMargin = 0;
-
-          if (newDepth >= OnePly)
-              preFutilityValueMargin = FutilityMargins[int(newDepth)];
-
-          Value futilityCaptureValue = ss[ply].eval + pos.endgame_value_of_piece_on(move_to(move)) + preFutilityValueMargin + ei.futilityMargin + 90;
-
-          if (futilityCaptureValue < beta)
-          {
-              if (futilityCaptureValue > bestValue)
-                  bestValue = futilityCaptureValue;
-              continue;
-          }
-      }
-
       // Futility pruning
       if (   !isCheck
           && !dangerous
@@ -1806,6 +1775,7 @@ namespace {
     const TTEntry* tte = NULL;
     int moveCount = 0;
     bool pvNode = (beta - alpha != 1);
+    Value oldAlpha = alpha;
 
     // Initialize, and make an early exit in case of an aborted search,
     // an instant draw, maximum ply reached, etc.
@@ -1949,14 +1919,14 @@ namespace {
 
     // Update transposition table
     Depth d = (depth == Depth(0) ? Depth(0) : Depth(-1));
-    if (bestValue < beta)
+    if (bestValue <= oldAlpha)
     {
         // If bestValue isn't changed it means it is still the static evaluation
         // of the node, so keep this info to avoid a future evaluation() call.
         ValueType type = (bestValue == staticValue && !ei.futilityMargin ? VALUE_TYPE_EV_UP : VALUE_TYPE_UPPER);
         TT.store(pos.get_key(), value_to_tt(bestValue, ply), type, d, MOVE_NONE);
     }
-    else
+    else if (bestValue >= beta)
     {
         move = ss[ply].pv[ply];
         TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_LOWER, d, move);
@@ -1965,6 +1935,8 @@ namespace {
         if (!pos.move_is_capture_or_promotion(move))
             update_killers(move, ss[ply]);
     }
+    else
+        TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_EXACT, d, ss[ply].pv[ply]);
 
     assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);