HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-20 17:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move TB stuff under Tablebases namespace

Browse Source 
Simplified also some logic while there.

TBLargest needs renaming too, but itis for
a future patch because touches also syzygy
directory stuff.

No functional change.
This commit is contained in:
Marco Costalba
2014-11-30 12:14:14 +01:00
committed by Joona Kiiski
parent c30eb4c9c9
commit eeb6d923fa
1 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/search.cpp
View File

@@ -43,14 +43,20 @@ namespace Search {
Position RootPos; Position RootPos;
Time::point SearchTime; Time::point SearchTime;
StateStackPtr SetupStates; StateStackPtr SetupStates;
int TBCardinality;
uint64_t TBHits;
bool RootInTB;
bool TB50MoveRule;
Depth TBProbeDepth;
Value TBScore;
} }
namespace Tablebases {
int Cardinality;
uint64_t Hits;
bool RootInTB;
bool UseRule50;
Depth ProbeDepth;
Value Score;
}
namespace TB = Tablebases;
using std::string; using std::string;
using Eval::evaluate; using Eval::evaluate;
using namespace Search; using namespace Search;
@@ -193,17 +199,17 @@ void Search::think() {
DrawValue[ RootPos.side_to_move()] = VALUE_DRAW - Value(cf); DrawValue[ RootPos.side_to_move()] = VALUE_DRAW - Value(cf);
DrawValue[~RootPos.side_to_move()] = VALUE_DRAW + Value(cf); DrawValue[~RootPos.side_to_move()] = VALUE_DRAW + Value(cf);
TBHits = 0; TB::Hits = 0;
RootInTB = false; TB::RootInTB = false;
TBProbeDepth = Options["SyzygyProbeDepth"] * ONE_PLY; TB::UseRule50 = Options["Syzygy50MoveRule"];
TB50MoveRule = Options["Syzygy50MoveRule"]; TB::ProbeDepth = Options["SyzygyProbeDepth"] * ONE_PLY;
TBCardinality = Options["SyzygyProbeLimit"]; TB::Cardinality = Options["SyzygyProbeLimit"];
// Skip TB probing when no TB found: !TBLargest -> !TBCardinality // Skip TB probing when no TB found: !TBLargest -> !TB::Cardinality
if (TBCardinality > Tablebases::TBLargest) if (TB::Cardinality > TB::TBLargest)
{ {
TBCardinality = Tablebases::TBLargest; TB::Cardinality = TB::TBLargest;
TBProbeDepth = DEPTH_ZERO; TB::ProbeDepth = DEPTH_ZERO;
} }
if (RootMoves.empty()) if (RootMoves.empty())
@@ -215,34 +221,34 @@ void Search::think() {
} }
else else
{ {
if (TBCardinality >= RootPos.count<ALL_PIECES>(WHITE) if (TB::Cardinality >= RootPos.count<ALL_PIECES>(WHITE)
+ RootPos.count<ALL_PIECES>(BLACK)) + RootPos.count<ALL_PIECES>(BLACK))
{ {
// If the current root position is in the tablebases then RootMoves // If the current root position is in the tablebases then RootMoves
// contains only moves that preserve the draw or win. // contains only moves that preserve the draw or win.
RootInTB = Tablebases::root_probe(RootPos, TBScore); TB::RootInTB = Tablebases::root_probe(RootPos, TB::Score);
if (RootInTB) if (TB::RootInTB)
TBCardinality = 0; // Do not probe tablebases during the search TB::Cardinality = 0; // Do not probe tablebases during the search
else // If DTZ tables are missing, use WDL tables as a fallback else // If DTZ tables are missing, use WDL tables as a fallback
{ {
// Filter out moves that do not preserve a draw or win // Filter out moves that do not preserve a draw or win
RootInTB = Tablebases::root_probe_wdl(RootPos, TBScore); TB::RootInTB = Tablebases::root_probe_wdl(RootPos, TB::Score);
// Only probe during search if winning // Only probe during search if winning
if (TBScore <= VALUE_DRAW) if (TB::Score <= VALUE_DRAW)
TBCardinality = 0; TB::Cardinality = 0;
} }
if (RootInTB) if (TB::RootInTB)
{ {
TBHits = RootMoves.size(); TB::Hits = RootMoves.size();
if (!TB50MoveRule) if (!TB::UseRule50)
TBScore = TBScore > VALUE_DRAW ? VALUE_MATE - MAX_PLY - 1 TB::Score = TB::Score > VALUE_DRAW ? VALUE_MATE - MAX_PLY - 1
: TBScore < VALUE_DRAW ? -VALUE_MATE + MAX_PLY + 1 : TB::Score < VALUE_DRAW ? -VALUE_MATE + MAX_PLY + 1
: VALUE_DRAW; : VALUE_DRAW;
} }
} }
@@ -538,34 +544,29 @@ namespace {
} }
// Step 4a. Tablebase probe // Step 4a. Tablebase probe
if (!RootNode && TBCardinality) if (!RootNode && TB::Cardinality)
{ {
int piecesCnt = pos.count<ALL_PIECES>(WHITE) + pos.count<ALL_PIECES>(BLACK); int piecesCnt = pos.count<ALL_PIECES>(WHITE) + pos.count<ALL_PIECES>(BLACK);
if ( piecesCnt <= TBCardinality if ( piecesCnt <= TB::Cardinality
&& (piecesCnt < TBCardinality || depth >= TBProbeDepth) && (piecesCnt < TB::Cardinality || depth >= TB::ProbeDepth)
&& pos.rule50_count() == 0) && pos.rule50_count() == 0)
{ {
int found, v = Tablebases::probe_wdl(pos, &found); int found, v = Tablebases::probe_wdl(pos, &found);
if (found) if (found)
{ {
TBHits++; TB::Hits++;
if (TB50MoveRule) { int drawScore = TB::UseRule50 ? 1 : 0;
value = v < -1 ? -VALUE_MATE + MAX_PLY + ss->ply
: v > 1 ? VALUE_MATE - MAX_PLY - ss->ply value = v < -drawScore ? -VALUE_MATE + MAX_PLY + ss->ply
: VALUE_DRAW + 2 * v; : v > drawScore ? VALUE_MATE - MAX_PLY - ss->ply
} : VALUE_DRAW + 2 * v * drawScore;
else
{
value = v < 0 ? -VALUE_MATE + MAX_PLY + ss->ply
: v > 0 ? VALUE_MATE - MAX_PLY - ss->ply
: VALUE_DRAW;
}
TT.store(posKey, value_to_tt(value, ss->ply), BOUND_EXACT, TT.store(posKey, value_to_tt(value, ss->ply), BOUND_EXACT,
std::min(DEPTH_MAX - ONE_PLY, depth + 6 * ONE_PLY), MOVE_NONE, VALUE_NONE); std::min(DEPTH_MAX - ONE_PLY, depth + 6 * ONE_PLY),
MOVE_NONE, VALUE_NONE);
return value; return value;
} }
@@ -1438,8 +1439,8 @@ moves_loop: // When in check and at SpNode search starts from here
Depth d = updated ? depth : depth - ONE_PLY; Depth d = updated ? depth : depth - ONE_PLY;
Value v = updated ? RootMoves[i].score : RootMoves[i].prevScore; Value v = updated ? RootMoves[i].score : RootMoves[i].prevScore;
bool tb = RootInTB && abs(v) < VALUE_MATE - MAX_PLY; bool tb = TB::RootInTB && abs(v) < VALUE_MATE - MAX_PLY;
v = tb ? TBScore : v; v = tb ? TB::Score : v;
if (ss.rdbuf()->in_avail()) // Not at first line if (ss.rdbuf()->in_avail()) // Not at first line
ss << "\n"; ss << "\n";
@@ -1450,7 +1451,7 @@ moves_loop: // When in check and at SpNode search starts from here
<< " score " << ((!tb && i == PVIdx) ? UCI::format_value(v, alpha, beta) : UCI::format_value(v)) << " score " << ((!tb && i == PVIdx) ? UCI::format_value(v, alpha, beta) : UCI::format_value(v))
<< " nodes " << pos.nodes_searched() << " nodes " << pos.nodes_searched()
<< " nps " << pos.nodes_searched() * 1000 / elapsed << " nps " << pos.nodes_searched() * 1000 / elapsed
<< " tbhits " << TBHits << " tbhits " << TB::Hits
<< " time " << elapsed << " time " << elapsed
<< " pv"; << " pv";