Improvde MultiPV - no functional change official-stockfish#2163

MichaelB7 · MichaelB7 · commit 51009b3c23e2 · 2019-05-29T10:54:51.000-04:00
(cherry picked from commit 1817411)
diff --git a/src/search.cpp b/src/search.cpp
@@ -427,8 +427,11 @@ ss->pv = pv;
 #endif
 
   beta = VALUE_INFINITE;
-
+#ifdef Maverick //Improve multiPV mode #2163 by Joerg Oster
+  multiPV = Options["MultiPV"];
+#else
   size_t multiPV = Options["MultiPV"];
+#endif
   Skill skill(Options["Skill Level"]);
 
 #ifdef Maverick //zugzwangMates
@@ -1156,6 +1159,14 @@ namespace {
           sync_cout << "info depth " << depth / ONE_PLY
                     << " currmove " << UCI::move(move, pos.is_chess960())
                     << " currmovenumber " << moveCount + thisThread->pvIdx << sync_endl;
+#ifdef Maverick  //  Improve multiPV mode #2163 by Joerg Oster
+      // In MultiPV mode also skip moves which will be searched later as PV moves
+     //  this section updated by mstembera
+     if (   rootNode
+         && std::find(thisThread->rootMoves.begin() + thisThread->pvIdx, thisThread->rootMoves.begin() + thisThread->pvLast, move)
+             == thisThread->rootMoves.begin() + thisThread->pvLast)
+          continue;
+#endif
       if (PvNode)
           (ss+1)->pv = nullptr;
 
diff --git a/src/thread.h b/src/thread.h
@@ -60,13 +60,14 @@ class Thread {
 
   Pawns::Table pawnsTable;
   Material::Table materialTable;
-  size_t pvIdx, pvLast;
 
-#ifdef Maverick //  Gunther Demetz zugzwangSolver
-    int selDepth, nmpMinPly, zugzwangMates;
-    int64_t visits, allScores; //  joergoster and Stefano80 monteCarloJ_03
+#ifdef Maverick
+  size_t pvIdx, multiPV, pvLast;  // Improve multiPV mode by joergoster
+  int selDepth, nmpMinPly, zugzwangMates; //  Gunther Demetz zugzwangSolver
+  int64_t visits, allScores; //  Moez Jellouli -> Save_probcut #e05dc73
 #else
-    int selDepth, nmpMinPly;
+  size_t pvIdx, pvLast;
+  int selDepth, nmpMinPly;   
 #endif
 
   Color nmpColor;
