X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=c1f90e119a24d82379eac5521bb950ca2732f4de;hp=0cbe09e007a1fa3e1c49337fc2919fcca8d909b5;hb=2161d8b0b3df48db419a25e3bc626c21eb062d75;hpb=bd618941ce6586507a641724646b9fe6b211a1b1

diff --git a/src/search.cpp b/src/search.cpp
index 0cbe09e0..c1f90e11 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -180,7 +180,7 @@ namespace {
   const Value FutilityMarginQS = Value(0x80);
 
   // Each move futility margin is decreased
-  const Value IncrementalFutilityMargin = Value(0x4);
+  const Value IncrementalFutilityMargin = Value(0x8);
 
   // Razoring
   const Depth RazorDepth = 4*OnePly;
@@ -288,7 +288,7 @@ namespace {
   bool move_is_killer(Move m, const SearchStack& ss);
   Depth extension(const Position& pos, Move m, bool pvNode, bool capture, bool check, bool singleReply, bool mateThreat, bool* dangerous);
   bool ok_to_do_nullmove(const Position& pos);
-  bool ok_to_prune(const Position& pos, Move m, Move threat, Depth d);
+  bool ok_to_prune(const Position& pos, Move m, Move threat);
   bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
   void update_history(const Position& pos, Move m, Depth depth, Move movesSearched[], int moveCount);
   void update_killers(Move m, SearchStack& ss);
@@ -1510,9 +1510,9 @@ namespace {
           && !captureOrPromotion
           &&  move != ttMove)
       {
-          // History pruning. See ok_to_prune() definition
+          // Move count based pruning
           if (   moveCount >= FutilityMoveCountMargin
-              && ok_to_prune(pos, move, ss[ply].threatMove, depth)
+              && ok_to_prune(pos, move, ss[ply].threatMove)
               && bestValue > value_mated_in(PLY_MAX))
               continue;
 
@@ -1841,9 +1841,9 @@ namespace {
           && !dangerous
           && !captureOrPromotion)
       {
-          // History pruning. See ok_to_prune() definition
+          // Move count based pruning
           if (   moveCount >= 2 + int(sp->depth)
-              && ok_to_prune(pos, move, ss[sp->ply].threatMove, sp->depth)
+              && ok_to_prune(pos, move, ss[sp->ply].threatMove)
               && sp->bestValue > value_mated_in(PLY_MAX))
               continue;
 
@@ -2464,7 +2464,7 @@ namespace {
   // non-tactical moves late in the move list close to the leaves are
   // candidates for pruning.
 
-  bool ok_to_prune(const Position& pos, Move m, Move threat, Depth d) {
+  bool ok_to_prune(const Position& pos, Move m, Move threat) {
 
     assert(move_is_ok(m));
     assert(threat == MOVE_NONE || move_is_ok(threat));
@@ -2498,11 +2498,7 @@ namespace {
         && pos.move_attacks_square(m, tto))
         return false;
 
-    // Case 4: Don't prune moves with good history
-    if (!H.ok_to_prune(pos.piece_on(mfrom), mto, d))
-        return false;
-
-    // Case 5: If the moving piece in the threatened move is a slider, don't
+    // Case 4: If the moving piece in the threatened move is a slider, don't
     // prune safe moves which block its ray.
     if (  !PruneBlockingMoves
         && threat != MOVE_NONE
@@ -2523,8 +2519,8 @@ namespace {
     Value v = value_from_tt(tte->value(), ply);
 
     return   (   tte->depth() >= depth
-              || v >= Max(value_mate_in(100), beta)
-              || v < Min(value_mated_in(100), beta))
+              || v >= Max(value_mate_in(PLY_MAX), beta)
+              || v < Min(value_mated_in(PLY_MAX), beta))
 
           && (   (is_lower_bound(tte->type()) && v >= beta)
               || (is_upper_bound(tte->type()) && v < beta));
@@ -2543,7 +2539,7 @@ namespace {
     {
         assert(m != movesSearched[i]);
         if (!pos.move_is_capture_or_promotion(movesSearched[i]))
-            H.failure(pos.piece_on(move_from(movesSearched[i])), move_to(movesSearched[i]));
+            H.failure(pos.piece_on(move_from(movesSearched[i])), move_to(movesSearched[i]), depth);
     }
   }