bool RootInTB;
bool UseRule50;
Depth ProbeDepth;
- Value Score;
}
namespace TB = Tablebases;
for (RootMove& rm : rootMoves)
rm.previousScore = rm.score;
+ size_t PVFirst = 0;
+ PVLast = 0;
+
// MultiPV loop. We perform a full root search for each PV line
for (PVIdx = 0; PVIdx < multiPV && !Threads.stop; ++PVIdx)
{
+ if (PVIdx == PVLast)
+ {
+ PVFirst = PVLast;
+ for (PVLast++; PVLast < rootMoves.size(); PVLast++)
+ if (rootMoves[PVLast].TBRank != rootMoves[PVFirst].TBRank)
+ break;
+ }
+
// Reset UCI info selDepth for each depth and each PV line
selDepth = 0;
// and we want to keep the same order for all the moves except the
// new PV that goes to the front. Note that in case of MultiPV
// search the already searched PV lines are preserved.
- std::stable_sort(rootMoves.begin() + PVIdx, rootMoves.end());
+ std::stable_sort(rootMoves.begin() + PVIdx, rootMoves.begin() + PVLast);
// If search has been stopped, we break immediately. Sorting is
// safe because RootMoves is still valid, although it refers to
}
// Sort the PV lines searched so far and update the GUI
- std::stable_sort(rootMoves.begin(), rootMoves.begin() + PVIdx + 1);
+ std::stable_sort(rootMoves.begin() + PVFirst, rootMoves.begin() + PVIdx + 1);
if ( mainThread
&& (Threads.stop || PVIdx + 1 == multiPV || Time.elapsed() > 3000))
// At root obey the "searchmoves" option and skip moves not listed in Root
// Move List. As a consequence any illegal move is also skipped. In MultiPV
- // mode we also skip PV moves which have been already searched.
+ // mode we also skip PV moves which have been already searched and those
+ // of lower "TB rank" if we are in a TB root position.
if (rootNode && !std::count(thisThread->rootMoves.begin() + thisThread->PVIdx,
- thisThread->rootMoves.end(), move))
+ thisThread->rootMoves.begin() + thisThread->PVLast, move))
continue;
ss->moveCount = ++moveCount;
Value v = updated ? rootMoves[i].score : rootMoves[i].previousScore;
bool tb = TB::RootInTB && abs(v) < VALUE_MATE - MAX_PLY;
- v = tb ? TB::Score : v;
+ v = tb ? rootMoves[i].TBScore : v;
if (ss.rdbuf()->in_avail()) // Not at first line
ss << "\n";
return pv.size() > 1;
}
-
-void Tablebases::filter_root_moves(Position& pos, Search::RootMoves& rootMoves) {
+void Tablebases::rank_root_moves(Position& pos, Search::RootMoves& rootMoves) {
RootInTB = false;
UseRule50 = Options["Syzygy50MoveRule"];
ProbeDepth = Options["SyzygyProbeDepth"] * ONE_PLY;
Cardinality = Options["SyzygyProbeLimit"];
+ bool dtz_available = true;
- // Skip TB probing when no TB found: !TBLargest -> !TB::Cardinality
+ // Tables with fewer pieces than SyzygyProbeLimit are searched with
+ // ProbeDepth == DEPTH_ZERO
if (Cardinality > MaxCardinality)
{
Cardinality = MaxCardinality;
ProbeDepth = DEPTH_ZERO;
}
- if (Cardinality < popcount(pos.pieces()) || pos.can_castle(ANY_CASTLING))
- return;
-
- // Don't filter any moves if the user requested analysis on multiple
- if (Options["MultiPV"] != 1)
- return;
+ if (Cardinality >= popcount(pos.pieces()) && !pos.can_castle(ANY_CASTLING))
+ {
+ // Rank moves using DTZ tables
+ RootInTB = root_probe(pos, rootMoves);
- // If the current root position is in the tablebases, then RootMoves
- // contains only moves that preserve the draw or the win.
- RootInTB = root_probe(pos, rootMoves, TB::Score);
+ if (!RootInTB)
+ {
+ // DTZ tables are missing; try to rank moves using WDL tables
+ dtz_available = false;
+ RootInTB = root_probe_wdl(pos, rootMoves);
+ }
+ }
if (RootInTB)
- Cardinality = 0; // Do not probe tablebases during the search
-
- else // If DTZ tables are missing, use WDL tables as a fallback
{
- // Filter out moves that do not preserve the draw or the win.
- RootInTB = root_probe_wdl(pos, rootMoves, TB::Score);
+ // Sort moves according to TB rank
+ std::sort(rootMoves.begin(), rootMoves.end(),
+ [](const RootMove &a, const RootMove &b) { return a.TBRank > b.TBRank; } );
- // Only probe during search if winning
- if (RootInTB && TB::Score <= VALUE_DRAW)
+ // Probe during search only if DTZ is not available and we are winning
+ if (dtz_available || rootMoves[0].TBScore <= VALUE_DRAW)
Cardinality = 0;
}
-
- if (RootInTB && !UseRule50)
- TB::Score = TB::Score > VALUE_DRAW ? VALUE_MATE - MAX_PLY - 1
- : TB::Score < VALUE_DRAW ? -VALUE_MATE + MAX_PLY + 1
- : VALUE_DRAW;
-
- // Since root_probe() and root_probe_wdl() dirty the root move scores,
- // we reset them to -VALUE_INFINITE
- for (RootMove& rm : rootMoves)
- rm.score = -VALUE_INFINITE;
+ else
+ {
+ // Assign the same rank to all moves
+ for (auto& m : rootMoves)
+ m.TBRank = 0;
+ }
}
#include "../search.h"
#include "../thread_win32.h"
#include "../types.h"
+#include "../uci.h"
#include "tbprobe.h"
return minDTZ == 0xFFFF ? -1 : minDTZ;
}
-// Check whether there has been at least one repetition of positions
-// since the last capture or pawn move.
-static int has_repeated(StateInfo *st)
-{
- while (1) {
- int i = 4, e = std::min(st->rule50, st->pliesFromNull);
-
- if (e < i)
- return 0;
-
- StateInfo *stp = st->previous->previous;
- do {
- stp = stp->previous->previous;
-
- if (stp->key == st->key)
- return 1;
-
- i += 2;
- } while (i <= e);
-
- st = st->previous;
- }
-}
-
-// Use the DTZ tables to filter out moves that don't preserve the win or draw.
-// If the position is lost, but DTZ is fairly high, only keep moves that
-// maximise DTZ.
+// Use the DTZ tables to rank root moves.
//
-// A return value false indicates that not all probes were successful and that
-// no moves were filtered out.
-bool Tablebases::root_probe(Position& pos, Search::RootMoves& rootMoves, Value& score)
-{
- assert(rootMoves.size());
+// A return value false indicates that not all probes were successful.
+bool Tablebases::root_probe(Position& pos, Search::RootMoves& rootMoves) {
ProbeState result;
- int dtz = probe_dtz(pos, &result);
-
- if (result == FAIL)
- return false;
-
StateInfo st;
- // Probe each move
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- Move move = rootMoves[i].pv[0];
- pos.do_move(move, st);
- int v = 0;
-
- if (pos.checkers() && dtz > 0) {
- ExtMove s[MAX_MOVES];
-
- if (generate<LEGAL>(pos, s) == s)
- v = 1;
- }
-
- if (!v) {
- if (st.rule50 != 0) {
- v = -probe_dtz(pos, &result);
-
- if (v > 0)
- ++v;
- else if (v < 0)
- --v;
- } else {
- v = -probe_wdl(pos, &result);
- v = dtz_before_zeroing(WDLScore(v));
- }
- }
-
- pos.undo_move(move);
-
- if (result == FAIL)
- return false;
-
- rootMoves[i].score = (Value)v;
- }
-
- // Obtain 50-move counter for the root position.
- // In Stockfish there seems to be no clean way, so we do it like this:
- int cnt50 = st.previous ? st.previous->rule50 : 0;
-
- // Use 50-move counter to determine whether the root position is
- // won, lost or drawn.
- WDLScore wdl = WDLDraw;
-
- if (dtz > 0)
- wdl = (dtz + cnt50 <= 100) ? WDLWin : WDLCursedWin;
- else if (dtz < 0)
- wdl = (-dtz + cnt50 <= 100) ? WDLLoss : WDLBlessedLoss;
+ // Obtain 50-move counter for the root position
+ int cnt50 = pos.rule50_count();
- // Determine the score to report to the user.
- score = WDL_to_value[wdl + 2];
+ // Check whether a position was repeated since the last zeroing move.
+ bool rep = pos.has_repeated();
- // If the position is winning or losing, but too few moves left, adjust the
- // score to show how close it is to winning or losing.
- // NOTE: int(PawnValueEg) is used as scaling factor in score_to_uci().
- if (wdl == WDLCursedWin && dtz <= 100)
- score = (Value)(((200 - dtz - cnt50) * int(PawnValueEg)) / 200);
- else if (wdl == WDLBlessedLoss && dtz >= -100)
- score = -(Value)(((200 + dtz - cnt50) * int(PawnValueEg)) / 200);
+ int dtz, bound = Options["Syzygy50MoveRule"] ? 900 : 1;
- // Now be a bit smart about filtering out moves.
- size_t j = 0;
-
- if (dtz > 0) { // winning (or 50-move rule draw)
- int best = 0xffff;
-
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- int v = rootMoves[i].score;
+ // Probe and rank each move
+ for (auto& m : rootMoves)
+ {
+ pos.do_move(m.pv[0], st);
- if (v > 0 && v < best)
- best = v;
+ // Calculate dtz for the current move counting from the root position
+ if (pos.rule50_count() == 0)
+ {
+ // In case of a zeroing move, dtz is one of -101/-1/0/1/101
+ WDLScore wdl = -probe_wdl(pos, &result);
+ dtz = dtz_before_zeroing(wdl);
}
-
- int max = best;
-
- // If the current phase has not seen repetitions, then try all moves
- // that stay safely within the 50-move budget, if there are any.
- if (!has_repeated(st.previous) && best + cnt50 <= 99)
- max = 99 - cnt50;
-
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- int v = rootMoves[i].score;
-
- if (v > 0 && v <= max)
- rootMoves[j++] = rootMoves[i];
+ else
+ {
+ // Otherwise, take dtz for the new position and correct by 1 ply
+ dtz = -probe_dtz(pos, &result);
+ dtz = dtz > 0 ? dtz + 1
+ : dtz < 0 ? dtz - 1 : dtz;
}
- } else if (dtz < 0) { // losing (or 50-move rule draw)
- int best = 0;
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- int v = rootMoves[i].score;
+ // Make sure that a mating move is assigned a dtz value of 1
+ if ( pos.checkers()
+ && dtz == 2
+ && MoveList<LEGAL>(pos).size() == 0)
+ dtz = 1;
- if (v < best)
- best = v;
- }
+ pos.undo_move(m.pv[0]);
- // Try all moves, unless we approach or have a 50-move rule draw.
- if (-best * 2 + cnt50 < 100)
- return true;
+ if (result == FAIL)
+ return false;
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- if (rootMoves[i].score == best)
- rootMoves[j++] = rootMoves[i];
- }
- } else { // drawing
- // Try all moves that preserve the draw.
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- if (rootMoves[i].score == 0)
- rootMoves[j++] = rootMoves[i];
- }
+ // Better moves are ranked higher. Certain wins are ranked equally.
+ // Losing moves are ranked equally unless a 50-move draw is in sight.
+ int r = dtz > 0 ? (dtz + cnt50 <= 99 && !rep ? 1000 : 1000 - (dtz + cnt50))
+ : dtz < 0 ? (-dtz * 2 + cnt50 < 100 ? -1000 : -1000 + (-dtz + cnt50))
+ : 0;
+ m.TBRank = r;
+
+ // Determine the score to be displayed for this move. Assign at least
+ // 1 cp to cursed wins and let it grow to 49 cp as the positions gets
+ // closer to a real win.
+ m.TBScore = r >= bound ? VALUE_MATE - MAX_PLY - 1
+ : r > 0 ? Value((std::max( 3, r - 800) * int(PawnValueEg)) / 200)
+ : r == 0 ? VALUE_DRAW
+ : r > -bound ? Value((std::min(-3, r + 800) * int(PawnValueEg)) / 200)
+ : -VALUE_MATE + MAX_PLY + 1;
}
- rootMoves.resize(j, Search::RootMove(MOVE_NONE));
-
return true;
}
-// Use the WDL tables to filter out moves that don't preserve the win or draw.
+
+// Use the WDL tables to rank root moves.
// This is a fallback for the case that some or all DTZ tables are missing.
//
-// A return value false indicates that not all probes were successful and that
-// no moves were filtered out.
-bool Tablebases::root_probe_wdl(Position& pos, Search::RootMoves& rootMoves, Value& score)
-{
- ProbeState result;
+// A return value false indicates that not all probes were successful.
+bool Tablebases::root_probe_wdl(Position& pos, Search::RootMoves& rootMoves) {
- WDLScore wdl = Tablebases::probe_wdl(pos, &result);
+ static const int WDL_to_rank[] = { -1000, -899, 0, 899, 1000 };
- if (result == FAIL)
- return false;
+ ProbeState result;
+ StateInfo st;
- score = WDL_to_value[wdl + 2];
+ bool rule50 = Options["Syzygy50MoveRule"];
- StateInfo st;
+ // Probe and rank each move
+ for (auto& m : rootMoves)
+ {
+ pos.do_move(m.pv[0], st);
- int best = WDLLoss;
+ WDLScore wdl = -probe_wdl(pos, &result);
- // Probe each move
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- Move move = rootMoves[i].pv[0];
- pos.do_move(move, st);
- WDLScore v = -Tablebases::probe_wdl(pos, &result);
- pos.undo_move(move);
+ pos.undo_move(m.pv[0]);
if (result == FAIL)
return false;
- rootMoves[i].score = (Value)v;
+ m.TBRank = WDL_to_rank[wdl + 2];
- if (v > best)
- best = v;
+ if (!rule50)
+ wdl = wdl > WDLDraw ? WDLWin
+ : wdl < WDLDraw ? WDLLoss : WDLDraw;
+ m.TBScore = WDL_to_value[wdl + 2];
}
- size_t j = 0;
-
- for (size_t i = 0; i < rootMoves.size(); ++i) {
- if (rootMoves[i].score == best)
- rootMoves[j++] = rootMoves[i];
- }
-
- rootMoves.resize(j, Search::RootMove(MOVE_NONE));
-
return true;
}
projects / stockfish / commitdiff