#include "thread.h"
#include "tt.h"
#include "uci.h"
-
-#ifdef SYZYGY
#include "syzygy/tbprobe.h"
-#endif
namespace Search {
}
size_t candidates_size() const { return candidates; }
- bool time_to_pick(Depth depth) const { return depth == 1 + level; }
+ bool time_to_pick(Depth depth) const { return depth / ONE_PLY == 1 + level; }
Move pick_move();
int level;
}
else
{
-#ifdef SYZYGY
// 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)
: TBScore;
}
}
-#endif
for (size_t i = 0; i < Threads.size(); ++i)
Threads[i]->maxPly = 0;
bool inCheck, givesCheck, singularExtensionNode, improving;
bool captureOrPromotion, dangerous, doFullDepthSearch;
int moveCount, quietCount;
+ int piecesCnt;
// Step 1. Initialize node
Thread* thisThread = pos.this_thread();
return ttValue;
}
-#ifdef SYZYGY
// 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);
return value;
}
}
-#endif
// Step 5. Evaluate the position statically and update parent's gain statistics
if (inCheck)
assert(eval - beta >= 0);
// Null move dynamic reduction based on depth and value
- Depth R = (3 + depth / 4 + std::min(int(eval - beta) / PawnValueMg, 3)) * ONE_PLY;
+ Depth R = (3 + depth / 4 + std::min((eval - beta) / PawnValueMg, 3)) * ONE_PLY;
pos.do_null_move(st);
(ss+1)->skipNullMove = true;
Signals.firstRootMove = (moveCount == 1);
if (thisThread == Threads.main() && Time::now() - SearchTime > 3000)
- sync_cout << "info depth " << depth
+ sync_cout << "info depth " << depth / ONE_PLY
<< " currmove " << UCI::format_move(move, pos.is_chess960())
<< " currmovenumber " << moveCount + PVIdx << sync_endl;
}
&& !ext
&& pos.legal(move, ci.pinned))
{
- Value rBeta = ttValue - int(2 * depth);
+ Value rBeta = ttValue - 2 * depth / ONE_PLY;
ss->excludedMove = move;
ss->skipNullMove = true;
value = search<NonPV, false>(pos, ss, rBeta - 1, rBeta, depth / 2, cutNode);
// Increase history value of the cut-off move and decrease all the other
// played quiet moves.
- Value bonus = Value(int(depth) * int(depth));
+ Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY));
History.update(pos.moved_piece(move), to_sq(move), bonus);
for (int i = 0; i < quietsCnt; ++i)
{
{
bool updated = (i <= PVIdx);
- if (depth == 1 && !updated)
+ if (depth == ONE_PLY && !updated)
continue;
Depth d = updated ? depth : depth - ONE_PLY;
Value v = updated ? RootMoves[i].score : RootMoves[i].prevScore;
- bool tb = RootInTB;
- if (tb)
- {
- if (abs(v) >= VALUE_MATE - MAX_PLY)
- tb = false;
- else
- v = TBScore;
- }
+ bool tb = RootInTB && abs(v) < VALUE_MATE - MAX_PLY;
+ v = tb ? TBScore : v;
if (ss.rdbuf()->in_avail()) // Not at first line
ss << "\n";