X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=8a8f9297fd547574aa99ff40fa7f5c3e2016fdd4;hp=18b972f27b4aba6348983f6894777329d117c5e9;hb=e2e360fcbc02e0ca3329a36766239e7175501103;hpb=c99d963fa54ad1af375c796632ada34bd0cf2a29

diff --git a/src/search.cpp b/src/search.cpp
index 18b972f2..8a8f9297 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -912,7 +912,7 @@ namespace {
         int64_t nodes;
         Move move;
         StateInfo st;
-        Depth ext, newDepth;
+        Depth depth, ext, newDepth;
 
         RootMoveNumber = i + 1;
         FailHigh = false;
@@ -935,8 +935,9 @@ namespace {
         bool moveIsCheck = pos.move_is_check(move);
         bool captureOrPromotion = pos.move_is_capture_or_promotion(move);
         bool dangerous;
+        depth =  (Iteration - 2) * OnePly + InitialDepth;
         ext = extension(pos, move, true, captureOrPromotion, moveIsCheck, false, false, &dangerous);
-        newDepth = (Iteration - 2) * OnePly + ext + InitialDepth;
+        newDepth = depth + ext;
 
         // Make the move, and search it
         pos.do_move(move, st, ci, moveIsCheck);
@@ -963,14 +964,19 @@ namespace {
         {
             // Try to reduce non-pv search depth by one ply if move seems not problematic,
             // if the move fails high will be re-searched at full depth.
-            if (   newDepth >= 3*OnePly
-                && i >= MultiPV + LMRPVMoves
+            if (   depth >= 3*OnePly // FIXME was newDepth
                 && !dangerous
                 && !captureOrPromotion
                 && !move_is_castle(move))
             {
-                ss[0].reduction = OnePly;
-                value = -search(pos, ss, -alpha, newDepth-OnePly, 1, true, 0);
+                double red = 0.5 + ln(RootMoveNumber - MultiPV + 1) * ln(depth / 2) / 6.0;
+                if (red >= 1.0)
+                {
+                    ss[0].reduction = Depth(int(floor(red * int(OnePly))));
+                    value = -search(pos, ss, -alpha, newDepth-ss[0].reduction, 1, true, 0);
+                }
+                else
+                    value = alpha + 1; // Just to trigger next condition
             } else
                 value = alpha + 1; // Just to trigger next condition
 
@@ -1220,10 +1226,10 @@ namespace {
             && !move_is_castle(move)
             && !move_is_killer(move, ss[ply]))
         {
-          double red = ln(moveCount) * ln(depth / 2) / 3.0;
+          double red = 0.5 + ln(moveCount) * ln(depth / 2) / 6.0;
           if (red >= 1.0)
           {
-              ss[ply].reduction = Depth(floor(red * int(OnePly)));
+              ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
               value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID);
           }
           else
@@ -1551,10 +1557,10 @@ namespace {
           && !move_is_killer(move, ss[ply])
           /* && move != ttMove*/)
       {
-          double red = ln(moveCount) * ln(depth / 2) / 1.5;
+          double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
           if (red >= 1.0)
           {
-              ss[ply].reduction = Depth(floor(red * int(OnePly)));
+              ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
               value = -search(pos, ss, -(beta-1), newDepth-ss[ply].reduction, ply+1, true, threadID);
           }
           else
@@ -1896,10 +1902,10 @@ namespace {
           && !move_is_castle(move)
           && !move_is_killer(move, ss[sp->ply]))
       {
-          double red = ln(moveCount) * ln(sp->depth / 2) / 1.5;
+          double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 3.0;
           if (red >= 1.0)
           {
-              ss[sp->ply].reduction = Depth(floor(red * int(OnePly)));
+              ss[sp->ply].reduction = Depth(int(floor(red * int(OnePly))));
               value = -search(pos, ss, -(sp->beta-1), newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
           }
           else
@@ -2007,10 +2013,10 @@ namespace {
           && !move_is_castle(move)
           && !move_is_killer(move, ss[sp->ply]))
       {
-          double red = ln(moveCount) * ln(sp->depth / 2) / 3.0;
+          double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 6.0;
           if (red >= 1.0)
           {
-              ss[sp->ply].reduction = Depth(floor(red * int(OnePly)));
+              ss[sp->ply].reduction = Depth(int(floor(red * int(OnePly))));
               value = -search(pos, ss, -sp->alpha, newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
           }
           else