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

Retire total_piece_count()

Browse Source 
We really don't need to uglify in this way
our nice count() API with this ad-hoc hack.

So remove the hack and use the already
existing infrastructure.

No functional change.

Resolves #134
This commit is contained in:
Marco Costalba
2014-11-30 20:35:22 +00:00
committed by Joona Kiiski
parent c014444f09
commit 314d446518
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/search.cpp
View File

@@ -205,7 +205,7 @@ void Search::think() {
else
{
// Check Tablebases at root
int piecesCnt = RootPos.total_piece_count();
int piecesCnt = RootPos.count<ALL_PIECES>(WHITE) + RootPos.count<ALL_PIECES>(BLACK);
TBCardinality = Options["SyzygyProbeLimit"];
TBProbeDepth = Options["SyzygyProbeDepth"] * ONE_PLY;
if (TBCardinality > Tablebases::TBLargest)
@@ -470,6 +470,7 @@ namespace {
bool inCheck, givesCheck, singularExtensionNode, improving;
bool captureOrPromotion, dangerous, doFullDepthSearch;
int moveCount, quietCount;
int piecesCnt;
// Step 1. Initialize node
Thread* thisThread = pos.this_thread();
@@ -548,10 +549,12 @@ namespace {
}
// Step 4a. Tablebase probe
piecesCnt = pos.count<ALL_PIECES>(WHITE) + pos.count<ALL_PIECES>(BLACK);
if ( !RootNode
&& pos.total_piece_count() <= TBCardinality
&& ( pos.total_piece_count() < TBCardinality || depth >= TBProbeDepth )
&& pos.rule50_count() == 0)
&& piecesCnt <= TBCardinality
&& (piecesCnt < TBCardinality || depth >= TBProbeDepth)
&& pos.rule50_count() == 0)
{
int found, v = Tablebases::probe_wdl(pos, &found);