Explicitly pass RootMoves to TB probes

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index b945c5cfe3d65fcfc51806188f872af1a0e145e7..5ea00331b9bd85b012f66f473295c092e0808066 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -39,7 +39,7 @@ namespace Search {
 
   volatile SignalsType Signals;
   LimitsType Limits;
-  std::vector<RootMove> RootMoves;
+  RootMoveVector RootMoves;
   Position RootPos;
   Time::point SearchTime;
   StateStackPtr SetupStates;
@@ -206,9 +206,9 @@ void Search::think() {
   TB::Cardinality = Options["SyzygyProbeLimit"];
 
   // Skip TB probing when no TB found: !TBLargest -> !TB::Cardinality
-  if (TB::Cardinality > TB::TBLargest)
+  if (TB::Cardinality > TB::MaxCardinality)
   {
-      TB::Cardinality = TB::TBLargest;
+      TB::Cardinality = TB::MaxCardinality;
       TB::ProbeDepth = DEPTH_ZERO;
   }
 
@@ -226,7 +226,7 @@ void Search::think() {
       {
           // If the current root position is in the tablebases then RootMoves
           // contains only moves that preserve the draw or win.
-          TB::RootInTB = Tablebases::root_probe(RootPos, TB::Score);
+          TB::RootInTB = Tablebases::root_probe(RootPos, RootMoves, TB::Score);
 
           if (TB::RootInTB)
               TB::Cardinality = 0; // Do not probe tablebases during the search
@@ -234,7 +234,7 @@ void Search::think() {
           else // If DTZ tables are missing, use WDL tables as a fallback
           {
               // Filter out moves that do not preserve a draw or win
-              TB::RootInTB = Tablebases::root_probe_wdl(RootPos, TB::Score);
+              TB::RootInTB = Tablebases::root_probe_wdl(RootPos, RootMoves, TB::Score);
 
               // Only probe during search if winning
               if (TB::Score <= VALUE_DRAW)