X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=a3912603b5af90ea0e60d69293f6d884b0946fc1;hp=a30776801970d1bde0502beaa8b4ca882572c03a;hb=342ceb1c9124ced53650d6c422a8cfa32e0b12ef;hpb=f010b6db71708e6aa480360167579db91903c4f1

diff --git a/src/search.cpp b/src/search.cpp
index a3077680..a3912603 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -180,14 +180,21 @@ namespace {
 
   // Margins for futility pruning in the quiescence search, and at frontier
   // and near frontier nodes
-  Value FutilityMarginQS;
-  Value FutilityMargins[6] = { Value(0x100), Value(0x200), Value(0x250),
-                               Value(0x2A0), Value(0x340), Value(0x3A0) };
+  const Value FutilityMarginQS = Value(0x80);
+
+                  //remaining depth:  1 ply         1.5 ply       2 ply         2.5 ply       3 ply         3.5 ply
+  const Value FutilityMargins[12] = { Value(0x100), Value(0x120), Value(0x200), Value(0x220), Value(0x250), Value(0x270),
+                  //                  4 ply         4.5 ply       5 ply         5.5 ply       6 ply         6.5 ply
+                                      Value(0x2A0), Value(0x2C0), Value(0x340), Value(0x360), Value(0x3A0), Value(0x3C0)};
 
   // Razoring
-  const bool RazorAtDepthOne = false;
-  Depth RazorDepth;
-  Value RazorMargin;
+  const Depth RazorDepth = 4*OnePly;
+
+              //remaining depth:  1 ply         1.5 ply       2 ply         2.5 ply       3 ply         3.5 ply
+  const Value RazorMargins[6] = { Value(0x180), Value(0x300), Value(0x300), Value(0x3C0), Value(0x3C0), Value(0x3C0) };
+
+               //remaining depth:     1 ply            1.5 ply       2 ply         2.5 ply       3 ply         3.5 ply
+  const Value RazorApprMargins[6] = { Value(0x100000), Value(0x300), Value(0x300), Value(0x300), Value(0x300), Value(0x300) };
 
   // Last seconds noise filtering (LSN)
   bool UseLSNFiltering;
@@ -437,13 +444,13 @@ void think(const Position &pos, bool infinite, bool ponder, int side_to_move,
   UseQSearchFutilityPruning = get_option_value_bool("Futility Pruning (Quiescence Search)");
   UseFutilityPruning = get_option_value_bool("Futility Pruning (Main Search)");
 
-  FutilityMarginQS = value_from_centipawns(get_option_value_int("Futility Margin (Quiescence Search)"));
-  int fmScale = get_option_value_int("Futility Margin Scale Factor (Main Search)");
-  for (int i = 0; i < 6; i++)
-      FutilityMargins[i] = (FutilityMargins[i] * fmScale) / 100;
+  //FutilityMarginQS = value_from_centipawns(get_option_value_int("Futility Margin (Quiescence Search)"));
+  //int fmScale = get_option_value_int("Futility Margin Scale Factor (Main Search)");
+  //for (int i = 0; i < 6; i++)
+  //    FutilityMargins[i] = (FutilityMargins[i] * fmScale) / 100;
 
-  RazorDepth = (get_option_value_int("Maximum Razoring Depth") + 1) * OnePly;
-  RazorMargin = value_from_centipawns(get_option_value_int("Razoring Margin"));
+  //RazorDepth = (get_option_value_int("Maximum Razoring Depth") + 1) * OnePly;
+  //RazorMargin = value_from_centipawns(get_option_value_int("Razoring Margin"));
 
   UseLSNFiltering = get_option_value_bool("LSN filtering");
   LSNTime = get_option_value_int("LSN Time Margin (sec)") * 1000;
@@ -1310,17 +1317,14 @@ namespace {
     }
     // Null move search not allowed, try razoring
     else if (   !value_is_mate(beta)
-             && approximateEval < beta - RazorMargin
              && depth < RazorDepth
-             && (RazorAtDepthOne || depth > OnePly)
+             && approximateEval < beta - RazorApprMargins[int(depth) - 2]
              && ttMove == MOVE_NONE
              && !pos.has_pawn_on_7th(pos.side_to_move()))
     {
         Value v = qsearch(pos, ss, beta-1, beta, Depth(0), ply, threadID);
-        if (   (v < beta - RazorMargin - RazorMargin / 4)
-            || (depth <= 2*OnePly && v < beta - RazorMargin)
-            || (depth <=   OnePly && v < beta - RazorMargin / 2))
-            return v;
+        if (v < beta - RazorMargins[int(depth) - 2])
+          return v;
     }
 
     // Go with internal iterative deepening if we don't have a TT move
@@ -1379,8 +1383,7 @@ namespace {
           {
               if (futilityValue == VALUE_NONE)
                   futilityValue =  evaluate(pos, ei, threadID)
-                                 + FutilityMargins[int(depth)/2 - 1]
-                                 + 32 * (depth & 1);
+                                 + FutilityMargins[int(depth) - 2];
 
               if (futilityValue < beta)
               {