From: joergoster <osterj165@googlemail.com>
Date: Thu, 4 Jul 2019 09:02:32 +0000 (+0200)
Subject: Revert "Improve multiPV mode"
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=fcee0ce6a39a28ffdfa4b1ed438b353a895edb6b;hp=8152a74ab4f703717fdb493cf9059f89be9a4fba

Revert "Improve multiPV mode"

This reverts commit a8de07cc26999e2fef7298a63bfe349aaa4650fa.
---

diff --git a/src/search.cpp b/src/search.cpp
index 6d1a66e5..98419b20 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -341,7 +341,7 @@ void Thread::search() {
   bestValue = delta = alpha = -VALUE_INFINITE;
   beta = VALUE_INFINITE;
 
-  multiPV = Options["MultiPV"];
+  size_t multiPV = Options["MultiPV"];
 
   // Pick integer skill levels, but non-deterministically round up or down
   // such that the average integer skill corresponds to the input floating point one.
@@ -934,12 +934,6 @@ moves_loop: // When in check, search starts from here
           sync_cout << "info depth " << depth / ONE_PLY
                     << " currmove " << UCI::move(move, pos.is_chess960())
                     << " currmovenumber " << moveCount + thisThread->pvIdx << sync_endl;
-
-      // In MultiPV mode also skip moves which will be searched later as PV moves
-      if (rootNode && std::count(thisThread->rootMoves.begin() + thisThread->pvIdx + 1,
-                                 thisThread->rootMoves.begin() + thisThread->multiPV, move))
-          continue;
-
       if (PvNode)
           (ss+1)->pv = nullptr;
 
diff --git a/src/thread.h b/src/thread.h
index 46ddb495..c11d1787 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -59,7 +59,7 @@ public:
 
   Pawns::Table pawnsTable;
   Material::Table materialTable;
-  size_t pvIdx, multiPV, pvLast, shuffleExts;
+  size_t pvIdx, pvLast, shuffleExts;
   int selDepth, nmpMinPly;
   Color nmpColor;
   std::atomic<uint64_t> nodes, tbHits, bestMoveChanges;