SignalsType Signals;
LimitsType Limits;
- StateStackPtr SetupStates;
}
namespace Tablebases {
Move pv[3];
};
+ // Set of rows with half bits set to 1 and half to 0. It is used to allocate
+ // the search depths across the threads.
+ typedef std::vector<int> Row;
+
+ const Row HalfDensity[] = {
+ {0, 1},
+ {1, 0},
+ {0, 0, 1, 1},
+ {0, 1, 1, 0},
+ {1, 1, 0, 0},
+ {1, 0, 0, 1},
+ {0, 0, 0, 1, 1, 1},
+ {0, 0, 1, 1, 1, 0},
+ {0, 1, 1, 1, 0, 0},
+ {1, 1, 1, 0, 0, 0},
+ {1, 1, 0, 0, 0, 1},
+ {1, 0, 0, 0, 1, 1},
+ {0, 0, 0, 0, 1, 1, 1, 1},
+ {0, 0, 0, 1, 1, 1, 1, 0},
+ {0, 0, 1, 1, 1, 1, 0 ,0},
+ {0, 1, 1, 1, 1, 0, 0 ,0},
+ {1, 1, 1, 1, 0, 0, 0 ,0},
+ {1, 1, 1, 0, 0, 0, 0 ,1},
+ {1, 1, 0, 0, 0, 0, 1 ,1},
+ {1, 0, 0, 0, 0, 1, 1 ,1},
+ };
+
+ const size_t HalfDensitySize = std::extent<decltype(HalfDensity)>::value;
+
EasyMoveManager EasyMove;
Value DrawValue[COLOR_NB];
CounterMoveHistoryStats CounterMoveHistory;
void Search::init() {
- const double K[][2] = {{ 0.799, 2.281 }, { 0.484, 3.023 }};
-
- for (int pv = 0; pv <= 1; ++pv)
- for (int imp = 0; imp <= 1; ++imp)
- for (int d = 1; d < 64; ++d)
- for (int mc = 1; mc < 64; ++mc)
- {
- double r = K[pv][0] + log(d) * log(mc) / K[pv][1];
+ for (int imp = 0; imp <= 1; ++imp)
+ for (int d = 1; d < 64; ++d)
+ for (int mc = 1; mc < 64; ++mc)
+ {
+ double r = log(d) * log(mc) / 2;
+ if (r < 0.80)
+ continue;
- if (r >= 1.5)
- Reductions[pv][imp][d][mc] = int(r) * ONE_PLY;
+ Reductions[NonPV][imp][d][mc] = int(std::round(r)) * ONE_PLY;
+ Reductions[PV][imp][d][mc] = std::max(Reductions[NonPV][imp][d][mc] - ONE_PLY, DEPTH_ZERO);
- // Increase reduction when eval is not improving
- if (!pv && !imp && Reductions[pv][imp][d][mc] >= 2 * ONE_PLY)
- Reductions[pv][imp][d][mc] += ONE_PLY;
- }
+ // Increase reduction for non-PV nodes when eval is not improving
+ if (!imp && Reductions[NonPV][imp][d][mc] >= 2 * ONE_PLY)
+ Reductions[NonPV][imp][d][mc] += ONE_PLY;
+ }
for (int d = 0; d < 16; ++d)
{
}
for (Thread* th : Threads)
- {
- th->maxPly = 0;
- th->rootDepth = DEPTH_ZERO;
if (th != this)
- {
- th->rootPos = Position(rootPos, th);
- th->rootMoves = rootMoves;
th->start_searching();
- }
- }
Thread::search(); // Let's start searching!
}
Thread* bestThread = this;
if ( !this->easyMovePlayed
&& Options["MultiPV"] == 1
- && !Skill(Options["Skill Level"]).enabled())
+ && !Skill(Options["Skill Level"]).enabled()
+ && rootMoves[0].pv[0] != MOVE_NONE)
{
for (Thread* th : Threads)
if ( th->completedDepth > bestThread->completedDepth
std::cout << sync_endl;
}
-const int halfDensityMap[][9] =
-{
- {2, 0, 1},
- {2, 1, 0},
-
- {4, 0, 0, 1, 1},
- {4, 0, 1, 1, 0},
- {4, 1, 1, 0, 0},
- {4, 1, 0, 0, 1},
-
- {6, 0, 0, 0, 1, 1, 1},
- {6, 0, 0, 1, 1, 1, 0},
- {6, 0, 1, 1, 1, 0, 0},
- {6, 1, 1, 1, 0, 0, 0},
- {6, 1, 1, 0, 0, 0, 1},
- {6, 1, 0, 0, 0, 1, 1},
-
- {8, 0, 0, 0, 0, 1, 1, 1, 1},
- {8, 0, 0, 0, 1, 1, 1, 1, 0},
- {8, 0, 0, 1, 1, 1, 1, 0 ,0},
- {8, 0, 1, 1, 1, 1, 0, 0 ,0},
- {8, 1, 1, 1, 1, 0, 0, 0 ,0},
- {8, 1, 1, 1, 0, 0, 0, 0 ,1},
- {8, 1, 1, 0, 0, 0, 0, 1 ,1},
- {8, 1, 0, 0, 0, 0, 1, 1 ,1},
-};
-
// Thread::search() is the main iterative deepening loop. It calls search()
// repeatedly with increasing depth until the allocated thinking time has been
// 2nd ply (using a half-density matrix).
if (!mainThread)
{
- int row = (idx - 1) % 20;
- if (halfDensityMap[row][(rootDepth + rootPos.game_ply()) % halfDensityMap[row][0] + 1])
+ const Row& row = HalfDensity[(idx - 1) % HalfDensitySize];
+ if (row[(rootDepth + rootPos.game_ply()) % row.size()])
continue;
}
moves_loop: // When in check search starts from here
Square prevSq = to_sq((ss-1)->currentMove);
+ Square ownPrevSq = to_sq((ss-2)->currentMove);
Move cm = thisThread->counterMoves[pos.piece_on(prevSq)][prevSq];
const CounterMoveStats& cmh = CounterMoveHistory[pos.piece_on(prevSq)][prevSq];
+ const CounterMoveStats& fmh = CounterMoveHistory[pos.piece_on(ownPrevSq)][ownPrevSq];
- MovePicker mp(pos, ttMove, depth, thisThread->history, cmh, cm, ss);
+ MovePicker mp(pos, ttMove, depth, thisThread->history, cmh, fmh, cm, ss);
CheckInfo ci(pos);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
improving = ss->staticEval >= (ss-2)->staticEval
&& cmh[pos.moved_piece(move)][to_sq(move)] < VALUE_ZERO)
continue;
- predictedDepth = newDepth - reduction<PvNode>(improving, depth, moveCount);
+ predictedDepth = std::max(newDepth - reduction<PvNode>(improving, depth, moveCount), DEPTH_ZERO);
// Futility pruning: parent node
if (predictedDepth < 7 * ONE_PLY)
&& !captureOrPromotion)
{
Depth r = reduction<PvNode>(improving, depth, moveCount);
+ Value hValue = thisThread->history[pos.piece_on(to_sq(move))][to_sq(move)];
+ Value cmhValue = cmh[pos.piece_on(to_sq(move))][to_sq(move)];
// Increase reduction for cut nodes and moves with a bad history
if ( (!PvNode && cutNode)
- || ( thisThread->history[pos.piece_on(to_sq(move))][to_sq(move)] < VALUE_ZERO
- && cmh[pos.piece_on(to_sq(move))][to_sq(move)] <= VALUE_ZERO))
+ || (hValue < VALUE_ZERO && cmhValue <= VALUE_ZERO))
r += ONE_PLY;
// Decrease/increase reduction for moves with a good/bad history
- int rHist = ( thisThread->history[pos.piece_on(to_sq(move))][to_sq(move)]
- + cmh[pos.piece_on(to_sq(move))][to_sq(move)]) / 14980;
+ int rHist = (hValue + cmhValue) / 14980;
r = std::max(DEPTH_ZERO, r - rHist * ONE_PLY);
// Decrease reduction for moves that escape a capture. Filter out
}
- // update_stats() updates killers, history, countermove and countermove
- // history when a new quiet best move is found.
+ // update_stats() updates killers, history, countermove and countermove plus
+ // follow-up move history when a new quiet best move is found.
void update_stats(const Position& pos, Stack* ss, Move move,
Depth depth, Move* quiets, int quietsCnt) {
Value bonus = Value((depth / ONE_PLY) * (depth / ONE_PLY) + depth / ONE_PLY - 1);
Square prevSq = to_sq((ss-1)->currentMove);
+ Square ownPrevSq = to_sq((ss-2)->currentMove);
CounterMoveStats& cmh = CounterMoveHistory[pos.piece_on(prevSq)][prevSq];
+ CounterMoveStats& fmh = CounterMoveHistory[pos.piece_on(ownPrevSq)][ownPrevSq];
Thread* thisThread = pos.this_thread();
thisThread->history.update(pos.moved_piece(move), to_sq(move), bonus);
cmh.update(pos.moved_piece(move), to_sq(move), bonus);
}
+ if (is_ok((ss-2)->currentMove))
+ fmh.update(pos.moved_piece(move), to_sq(move), bonus);
+
// Decrease all the other played quiet moves
for (int i = 0; i < quietsCnt; ++i)
{
if (is_ok((ss-1)->currentMove))
cmh.update(pos.moved_piece(quiets[i]), to_sq(quiets[i]), -bonus);
+
+ if (is_ok((ss-2)->currentMove))
+ fmh.update(pos.moved_piece(quiets[i]), to_sq(quiets[i]), -bonus);
}
// Extra penalty for a quiet TT move in previous ply when it gets refuted
Move Skill::pick_best(size_t multiPV) {
- const Search::RootMoveVector& rootMoves = Threads.main()->rootMoves;
+ const RootMoves& rootMoves = Threads.main()->rootMoves;
static PRNG rng(now()); // PRNG sequence should be non-deterministic
// RootMoves are already sorted by score in descending order
std::stringstream ss;
int elapsed = Time.elapsed() + 1;
- const Search::RootMoveVector& rootMoves = pos.this_thread()->rootMoves;
+ const RootMoves& rootMoves = pos.this_thread()->rootMoves;
size_t PVIdx = pos.this_thread()->PVIdx;
size_t multiPV = std::min((size_t)Options["MultiPV"], rootMoves.size());
uint64_t nodes_searched = Threads.nodes_searched();
projects / stockfish / blobdiff