Revert "Improve multiPV mode"

This reverts commit a8de07cc26999e2fef7298a63bfe349aaa4650fa.

diff --git a/src/search.cpp b/src/search.cpp
index 6d1a66e5f8688b24e6c5d9f96d7e8fd5c4b2c2c9..98419b20fc75b9ee7bde88ce952da472719fff34 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -341,7 +341,7 @@ void Thread::search() {
   bestValue = delta = alpha = -VALUE_INFINITE;
   beta = VALUE_INFINITE;
 
   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.
 
   // 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;
           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;
 
       if (PvNode)
           (ss+1)->pv = nullptr;
 

diff --git a/src/thread.h b/src/thread.h
index 46ddb49529357f4cbefffa61ff1ecdc2b83bbdb9..c11d17873df5621ed4892ddbce016332ef55e24c 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -59,7 +59,7 @@ public:
 
   Pawns::Table pawnsTable;
   Material::Table materialTable;
 
   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;
   int selDepth, nmpMinPly;
   Color nmpColor;
   std::atomic<uint64_t> nodes, tbHits, bestMoveChanges;