X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=8088ff76c94ce36418d7307347ab16d211ae350e;hb=7d5b8fcf7724a66f191cae45d858a1b3d63c2bce;hp=eda9d2929847377916e20fc7608e3c7659531c2f;hpb=1e92df6b20aa224026b435e03169edaf4bbecdc1;p=stockfish

diff --git a/src/search.cpp b/src/search.cpp
index eda9d292..8088ff76 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -409,9 +409,7 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) {
   read_evaluation_uci_options(pos.side_to_move());
   Threads.read_uci_options();
 
-  // Allocate pawn and material hash tables if number of active threads
-  // increased and set a new TT size if changed.
-  Threads.init_hash_tables();
+  // Set a new TT size if changed
   TT.set_size(Options["Hash"].value<int>());
 
   if (Options["Clear Hash"].value<bool>())
@@ -536,8 +534,10 @@ namespace {
 
         Rml.bestMoveChanges = 0;
 
-        // MultiPV iteration loop
-        for (MultiPVIteration = 0; MultiPVIteration < Min(MultiPV, (int)Rml.size()); MultiPVIteration++)
+        // MultiPV iteration loop. At depth 1 perform at least 2 iterations to
+        // get a score of the second best move for easy move detection.
+        int e = Min(Max(MultiPV, 2 * int(depth == 1)), (int)Rml.size());
+        for (MultiPVIteration = 0; MultiPVIteration < e; MultiPVIteration++)
         {
             // Calculate dynamic aspiration window based on previous iterations
             if (depth >= 5 && abs(Rml[MultiPVIteration].prevScore) < VALUE_KNOWN_WIN)
@@ -1002,8 +1002,7 @@ split_point_start: // At split points actual search starts from here
                    << " currmovenumber " << moveCount + MultiPVIteration << endl;
       }
 
-      // At Root and at first iteration do a PV search on all the moves to score root moves
-      isPvMove = (PvNode && moveCount <= (RootNode && depth <= ONE_PLY ? MAX_MOVES : 1));
+      isPvMove = (PvNode && moveCount == 1);
       givesCheck = pos.move_gives_check(move, ci);
       captureOrPromotion = pos.move_is_capture_or_promotion(move);
 
@@ -2168,7 +2167,6 @@ void Thread::idle_loop(SplitPoint* sp) {
           if (do_terminate)
           {
               assert(!sp);
-              state = Thread::TERMINATED;
               lock_release(&sleepLock);
               return;
           }