X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=f259ab707fe7983a271bdd6b05093490d6fe404a;hp=b653ef9e70f1b33dcde02a8310ea35e24ab6d288;hb=6247f27a0548562c122f658082d31f535208d603;hpb=05a8c318b8cfc284906f6077fd934d35d891028c

diff --git a/src/search.cpp b/src/search.cpp
index b653ef9e..f259ab70 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1403,7 +1403,7 @@ namespace {
 
     // Calculate depth dependant futility pruning parameters
     const int FutilityMoveCountMargin = 3 + (1 << (3 * int(depth) / 8));
-    const int FutilityValueMargin = 112 * bitScanReverse32(int(depth) * int(depth) / 2);
+    const int PostFutilityValueMargin = 112 * bitScanReverse32(int(depth) * int(depth) / 2);
 
     // Evaluate the position statically
     if (!isCheck)
@@ -1417,7 +1417,7 @@ namespace {
         }
 
         ss[ply].eval = staticValue;
-        futilityValue = staticValue + FutilityValueMargin;
+        futilityValue = staticValue + PostFutilityValueMargin; //FIXME: Remove me, only for split
         staticValue = refine_eval(tte, staticValue, ply); // Enhance accuracy with TT value if possible
 
         // Store gain statistics
@@ -1430,8 +1430,8 @@ namespace {
     }
 
     // Post futility pruning
-    if (staticValue - FutilityValueMargin >= beta)
-        return (staticValue - FutilityValueMargin);
+    if (staticValue - PostFutilityValueMargin >= beta)
+        return (staticValue - PostFutilityValueMargin);
 
     // Null move search
     if (    allowNullmove
@@ -1556,6 +1556,28 @@ namespace {
       // Update current move
       movesSearched[moveCount++] = ss[ply].currentMove = move;
 
+      // Futility pruning for captures
+      Color them = opposite_color(pos.side_to_move());
+
+      if (    useFutilityPruning
+          && !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 = 112 * bitScanReverse32(int(newDepth) * int(newDepth) / 2);
+
+          if (ss[ply].eval + pos.endgame_value_of_piece_on(move_to(move)) + preFutilityValueMargin + ei.futilityMargin + 90 < beta)
+              continue;
+      }
+
+
       // Futility pruning
       if (    useFutilityPruning
           && !dangerous
@@ -1570,7 +1592,20 @@ namespace {
               continue;
 
           // Value based pruning
-          futilityValueScaled = futilityValue - moveCount * IncrementalFutilityMargin;
+          Depth predictedDepth = newDepth;
+
+          //FIXME HACK: awful code duplication
+          double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
+          if (red >= 1.0)
+              predictedDepth -= int(floor(red * int(OnePly)));
+
+          int preFutilityValueMargin = 0;
+          if (predictedDepth >= OnePly)
+              preFutilityValueMargin = 112 * bitScanReverse32(int(predictedDepth) * int(predictedDepth) / 2);
+
+          preFutilityValueMargin += MG.retrieve(pos.piece_on(move_from(move)), move_from(move), move_to(move)) + 45;
+
+          futilityValueScaled = ss[ply].eval + preFutilityValueMargin - moveCount * IncrementalFutilityMargin;
 
           if (futilityValueScaled < beta)
           {
@@ -1631,7 +1666,7 @@ namespace {
           && idle_thread_exists(threadID)
           && !AbortSearch
           && !thread_should_stop(threadID)
-          && split(pos, ss, ply, &beta, &beta, &bestValue, futilityValue,
+          && split(pos, ss, ply, &beta, &beta, &bestValue, futilityValue, //FIXME: SMP & futilityValue
                    depth, &moveCount, &mp, threadID, false))
           break;
     }