Update stats at pv nodes

locutus2 · zamar · commit 27efc5ac996f · 2015-04-10T20:34:55.000+01:00
If a quiet best move is found at a pv node then always update stats. STC: LLR: 2.96 (-2.94,2.94) [-1.50,4.50] Total: 41485 W: 8047 L: 7830 D: 25608 LTC: LLR: 2.96 (-2.94,2.94) [0.00,6.00] Total: 14351 W: 2420 L: 2250 D: 9681 Bench: 6985247 Resolves #330
diff --git a/src/search.cpp b/src/search.cpp
@@ -945,8 +945,6 @@ namespace {
       }
 
       ss->currentMove = move;
-      if (!SpNode && !captureOrPromotion && quietCount < 64)
-          quietsSearched[quietCount++] = move;
 
       // Step 14. Make the move
       pos.do_move(move, st, givesCheck);
@@ -1070,6 +1068,7 @@ namespace {
               rm.score = -VALUE_INFINITE;
       }
 
+      bool newBestMove = false;
       if (value > bestValue)
       {
           bestValue = SpNode ? splitPoint->bestValue = value : value;
@@ -1082,6 +1081,7 @@ namespace {
                   && (move != EasyMove.get(pos.key()) || moveCount > 1))
                   EasyMove.clear();
 
+              newBestMove = true;
               bestMove = SpNode ? splitPoint->bestMove = move : move;
 
               if (PvNode && !RootNode) // Update pv even in fail-high case
@@ -1101,6 +1101,9 @@ namespace {
           }
       }
 
+      if (!SpNode && !captureOrPromotion && !newBestMove && quietCount < 64)
+          quietsSearched[quietCount++] = move;
+
       // Step 19. Check for splitting the search
       if (   !SpNode
           &&  Threads.size() >= 2
@@ -1144,8 +1147,8 @@ namespace {
                    :     inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()];
 
     // Quiet best move: update killers, history and countermoves
-    else if (bestValue >= beta && !pos.capture_or_promotion(bestMove))
-        update_stats(pos, ss, bestMove, depth, quietsSearched, quietCount - 1);
+    else if (bestMove != MOVE_NONE && !pos.capture_or_promotion(bestMove))
+        update_stats(pos, ss, bestMove, depth, quietsSearched, quietCount);
 
     tte->save(posKey, value_to_tt(bestValue, ss->ply),
               bestValue >= beta ? BOUND_LOWER :
@@ -1402,8 +1405,7 @@ namespace {
     *pv = MOVE_NONE;
   }
 
-  // update_stats() updates killers, history and countermoves stats after a fail-high
-  // of a quiet move.
+  // update_stats() updates killers, history, countermove history and countermoves stats for a quiet best move.
 
   void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt) {
 
