Fix wrong reported depth

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 791cbc6fb580901a567296d23a0eeed08f892969..a068c172b5fd608a2daff43afb84bb55bde52fc5 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -297,7 +297,6 @@ namespace {
   Value value_to_tt(Value v, int ply);
   Value value_from_tt(Value v, int ply);
   bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
-  bool ok_to_use_TT_PV(const TTEntry* tte, Depth depth, Value alpha, Value beta, int ply);
   bool connected_threat(const Position& pos, Move m, Move threat);
   Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
   void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount);
@@ -634,31 +633,29 @@ namespace {
         return MOVE_NONE;
     }
 
-    // Send initial scoring (iteration 1)
-    cout << set960(pos.is_chess960()) // Is enough to set once at the beginning
-         << "info depth " << iteration
-         << "\n" << Rml[0].pv_info_to_uci(pos, ONE_PLY, alpha, beta) << endl;
-
     // Is one move significantly better than others after initial scoring ?
     if (   Rml.size() == 1
         || Rml[0].pv_score > Rml[1].pv_score + EasyMoveMargin)
         easyMove = Rml[0].pv[0];
 
     // Iterative deepening loop
-    while (++iteration <= PLY_MAX && (!MaxDepth || iteration <= MaxDepth) && !StopRequest)
+    while (++iteration <= PLY_MAX && !StopRequest)
     {
-        cout << "info depth " << iteration << endl;
-
         Rml.bestMoveChanges = researchCountFL = researchCountFH = 0;
         depth = (iteration - 1) * ONE_PLY;
 
+        if (MaxDepth && depth > MaxDepth * ONE_PLY)
+            break;
+
+        cout << "info depth " << depth / ONE_PLY << endl;
+
         // Calculate dynamic aspiration window based on previous iterations
         if (MultiPV == 1 && iteration >= 6 && abs(bestValues[iteration - 1]) < VALUE_KNOWN_WIN)
         {
             int prevDelta1 = bestValues[iteration - 1] - bestValues[iteration - 2];
             int prevDelta2 = bestValues[iteration - 2] - bestValues[iteration - 3];
 
-            aspirationDelta = Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16);
+            aspirationDelta = Min(Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16), 24);
             aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize
 
             alpha = Max(bestValues[iteration - 1] - aspirationDelta, -VALUE_INFINITE);
@@ -672,10 +669,14 @@ namespace {
             // Search starting from ss+1 to allow calling update_gains()
             value = search<PV, false, true>(pos, ss+1, alpha, beta, depth, 0);
 
-            // Write PV lines to transposition table, in case the relevant entries
-            // have been overwritten during the search.
+            // Send PV line to GUI and write to transposition table in case the
+            // relevant entries have been overwritten during the search.
             for (int i = 0; i < Min(MultiPV, (int)Rml.size()); i++)
+            {
                 Rml[i].insert_pv_in_tt(pos);
+                cout << set960(pos.is_chess960())
+                     << Rml[i].pv_info_to_uci(pos, depth, alpha, beta, i) << endl;
+            }
 
             // Value cannot be trusted. Break out immediately!
             if (StopRequest)
@@ -839,10 +840,13 @@ namespace {
     tte = TT.retrieve(posKey);
     ttMove = tte ? tte->move() : MOVE_NONE;
 
-    // At PV nodes we check for exact scores within (alha, beta) range, while
-    // at non-PV nodes we check for and return a fail high/low. Biggest advantage
-    // at probing at PV nodes is to have a smooth experience in analysis mode.
-    if (!Root && tte && (PvNode ? ok_to_use_TT_PV(tte, depth, alpha, beta, ply) : ok_to_use_TT(tte, depth, beta, ply)))
+    // At PV nodes we check for exact scores, while at non-PV nodes we check for
+    // and return a fail high/low. Biggest advantage at probing at PV nodes is
+    // to have a smooth experience in analysis mode.
+    if (   !Root
+        && tte
+        && (PvNode ? tte->depth() >= depth && tte->type() == VALUE_TYPE_EXACT
+                   : ok_to_use_TT(tte, depth, beta, ply)))
     {
         TT.refresh(tte);
         ss->bestMove = ttMove; // Can be MOVE_NONE
@@ -1261,13 +1265,8 @@ split_point_start: // At split points actual search starts from here
               if (!isPvMove && MultiPV == 1)
                   Rml.bestMoveChanges++;
 
-              // Inform GUI that PV has changed, in case of multi-pv UCI protocol
-              // requires we send all the PV lines properly sorted.
               Rml.sort_multipv(moveCount);
 
-              for (int j = 0; j < Min(MultiPV, (int)Rml.size()); j++)
-                  cout << Rml[j].pv_info_to_uci(pos, depth, alpha, beta, j) << endl;
-
               // Update alpha. In multi-pv we don't use aspiration window, so
               // set alpha equal to minimum score among the PV lines.
               if (MultiPV > 1)
@@ -1794,9 +1793,7 @@ split_point_start: // At split points actual search starts from here
 
 
   // ok_to_use_TT() returns true if a transposition table score
-  // can be used at a given point in search. There are two versions
-  // one to be used in non-PV nodes and one in PV nodes where we look
-  // for an exact score that falls between (alha, beta) boundaries.
+  // can be used at a given point in search.
 
   bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply) {
 
@@ -1810,17 +1807,6 @@ split_point_start: // At split points actual search starts from here
               || ((tte->type() & VALUE_TYPE_UPPER) && v < beta));
   }
 
-  bool ok_to_use_TT_PV(const TTEntry* tte, Depth depth, Value alpha, Value beta, int ply) {
-
-    Value v = value_from_tt(tte->value(), ply);
-
-     return   tte->depth() >= depth
-           && tte->type() == VALUE_TYPE_EXACT
-           && tte->move() != MOVE_NONE
-           && v < beta
-           && v > alpha;
-  }
-
 
   // refine_eval() returns the transposition table score if
   // possible otherwise falls back on static position evaluation.