Start to count iterations from 1

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index fba9e53559f5b883f0cd479923ac2abe7a88ab78..edd23dad431f7de4037db2c9e8b8604616438022 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -617,42 +617,39 @@ namespace {
     TT.new_search();
     H.clear();
     memset(ss, 0, PLY_MAX_PLUS_2 * sizeof(SearchStack));
-    alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
     *ponderMove = bestMove = easyMove = MOVE_NONE;
-    aspirationDelta = 0;
-    iteration = 1;
+    iteration = aspirationDelta = 0;
     ss->currentMove = MOVE_NULL; // Hack to skip update_gains()
+    alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
 
     // Handle special case of searching on a mate/stale position
     if (Rml.size() == 0)
     {
-        cout << "info depth " << iteration << " score "
+        cout << "info depth 0 score "
              << value_to_uci(pos.is_check() ? -VALUE_MATE : VALUE_DRAW)
              << endl;
 
         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;
+        depth = iteration * 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)
+        if (MultiPV == 1 && iteration >= 5 && abs(bestValues[iteration - 1]) < VALUE_KNOWN_WIN)
         {
             int prevDelta1 = bestValues[iteration - 1] - bestValues[iteration - 2];
             int prevDelta2 = bestValues[iteration - 2] - bestValues[iteration - 3];
@@ -671,10 +668,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)
@@ -716,15 +717,15 @@ namespace {
             bool noMoreTime = false;
 
             // Stop search early when the last two iterations returned a mate score
-            if (   iteration >= 6
-                && abs(bestValues[iteration])   >= abs(VALUE_MATE) - 100
-                && abs(bestValues[iteration-1]) >= abs(VALUE_MATE) - 100)
+            if (   iteration >= 5
+                && abs(bestValues[iteration])     >= abs(VALUE_MATE) - 100
+                && abs(bestValues[iteration - 1]) >= abs(VALUE_MATE) - 100)
                 noMoreTime = true;
 
             // Stop search early if one move seems to be much better than the
             // others or if there is only a single legal move. In this latter
             // case we search up to Iteration 8 anyway to get a proper score.
-            if (   iteration >= 8
+            if (   iteration >= 7
                 && easyMove == bestMove
                 && (   Rml.size() == 1
                     ||(   Rml[0].nodes > (pos.nodes_searched() * 85) / 100
@@ -734,7 +735,7 @@ namespace {
                 noMoreTime = true;
 
             // Add some extra time if the best move has changed during the last two iterations
-            if (iteration > 5 && iteration <= 50)
+            if (iteration > 4 && iteration < 50)
                 TimeMgr.pv_instability(bestMoveChanges[iteration], bestMoveChanges[iteration-1]);
 
             // Stop search if most of MaxSearchTime is consumed at the end of the
@@ -1263,13 +1264,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)