CountermovesStats Countermoves;
template <NodeType NT>
- Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth);
+ Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode);
template <NodeType NT, bool InCheck>
Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth);
size_t Search::perft(Position& pos, Depth depth) {
- // At the last ply just return the number of legal moves (leaf nodes)
- if (depth == ONE_PLY)
- return MoveList<LEGAL>(pos).size();
-
StateInfo st;
size_t cnt = 0;
CheckInfo ci(pos);
+ const bool leaf = depth == 2 * ONE_PLY;
for (MoveList<LEGAL> it(pos); *it; ++it)
{
pos.do_move(*it, st, ci, pos.move_gives_check(*it, ci));
- cnt += perft(pos, depth - ONE_PLY);
+ cnt += leaf ? MoveList<LEGAL>(pos).size() : perft(pos, depth - ONE_PLY);
pos.undo_move(*it);
}
-
return cnt;
}
Value bestValue, alpha, beta, delta;
memset(ss-1, 0, 4 * sizeof(Stack));
- depth = BestMoveChanges = 0;
- bestValue = delta = -VALUE_INFINITE;
(ss-1)->currentMove = MOVE_NULL; // Hack to skip update gains
+
+ depth = BestMoveChanges = 0;
+ bestValue = delta = alpha = -VALUE_INFINITE;
+ beta = VALUE_INFINITE;
+
TT.new_search();
History.clear();
Gains.clear();
// MultiPV loop. We perform a full root search for each PV line
for (PVIdx = 0; PVIdx < PVSize; PVIdx++)
{
- // Set aspiration window default width
- if (depth >= 5 && abs(RootMoves[PVIdx].prevScore) < VALUE_KNOWN_WIN)
+ // Reset aspiration window starting size
+ if (depth >= 5)
{
delta = Value(16);
- alpha = RootMoves[PVIdx].prevScore - delta;
- beta = RootMoves[PVIdx].prevScore + delta;
- }
- else
- {
- alpha = -VALUE_INFINITE;
- beta = VALUE_INFINITE;
+ alpha = std::max(RootMoves[PVIdx].prevScore - delta,-VALUE_INFINITE);
+ beta = std::min(RootMoves[PVIdx].prevScore + delta, VALUE_INFINITE);
}
// Start with a small aspiration window and, in case of fail high/low,
// research with bigger window until not failing high/low anymore.
while (true)
{
- bestValue = search<Root>(pos, ss, alpha, beta, depth * ONE_PLY);
+ bestValue = search<Root>(pos, ss, alpha, beta, depth * ONE_PLY, false);
// Bring to front the best move. It is critical that sorting is
// done with a stable algorithm because all the values but the first
if (Signals.stop)
return;
- // In case of failing high/low increase aspiration window and
- // research, otherwise exit the loop.
- if (bestValue > alpha && bestValue < beta)
- break;
+ delta += delta / 2;
- // Give some update (without cluttering the UI) before to research
- if (Time::now() - SearchTime > 3000)
- sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
-
- if (abs(bestValue) >= VALUE_KNOWN_WIN)
- {
- alpha = -VALUE_INFINITE;
- beta = VALUE_INFINITE;
- }
- else if (bestValue >= beta)
- {
- beta += delta;
- delta += delta / 2;
- }
- else
+ // In case of failing low/high increase aspiration window and
+ // research, otherwise exit the loop.
+ if (bestValue <= alpha)
{
+ alpha = std::max(bestValue - delta, -VALUE_INFINITE);
+
Signals.failedLowAtRoot = true;
Signals.stopOnPonderhit = false;
-
- alpha -= delta;
- delta += delta / 2;
}
+ else if (bestValue >= beta)
+ beta = std::min(bestValue + delta, VALUE_INFINITE);
+
+ else
+ break;
assert(alpha >= -VALUE_INFINITE && beta <= VALUE_INFINITE);
+
+ // Give some update (without cluttering the UI) before to research
+ if (Time::now() - SearchTime > 3000)
+ sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
}
// Sort the PV lines searched so far and update the GUI
rm = *std::find(RootMoves.begin(), RootMoves.end(), skill.best);
Log log(Options["Search Log Filename"]);
- log << pretty_pv(pos, depth, rm.score, Time::now() - SearchTime, rm.pv.data())
+ log << pretty_pv(pos, depth, rm.score, Time::now() - SearchTime, &rm.pv[0])
<< std::endl;
}
Value rBeta = bestValue - 2 * PawnValueMg;
ss->excludedMove = RootMoves[0].pv[0];
ss->skipNullMove = true;
- Value v = search<NonPV>(pos, ss, rBeta - 1, rBeta, (depth - 3) * ONE_PLY);
+ Value v = search<NonPV>(pos, ss, rBeta - 1, rBeta, (depth - 3) * ONE_PLY, true);
ss->skipNullMove = false;
ss->excludedMove = MOVE_NONE;
// here: This is taken care of after we return from the split point.
template <NodeType NT>
- Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth) {
+ Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, bool cutNode) {
const bool PvNode = (NT == PV || NT == Root || NT == SplitPointPV || NT == SplitPointRoot);
const bool SpNode = (NT == SplitPointPV || NT == SplitPointNonPV || NT == SplitPointRoot);
assert(PvNode || (alpha == beta - 1));
assert(depth > DEPTH_ZERO);
- Move movesSearched[64];
+ Move quietsSearched[64];
StateInfo st;
const TTEntry *tte;
SplitPoint* splitPoint;
Value eval, nullValue, futilityValue;
bool inCheck, givesCheck, pvMove, singularExtensionNode;
bool captureOrPromotion, dangerous, doFullDepthSearch;
- int moveCount, playedMoveCount;
+ int moveCount, quietCount;
// Step 1. Initialize node
Thread* thisThread = pos.this_thread();
- moveCount = playedMoveCount = 0;
+ moveCount = quietCount = 0;
inCheck = pos.checkers();
if (SpNode)
&& tte
&& tte->depth() >= depth
&& ttValue != VALUE_NONE // Only in case of TT access race
- && ( PvNode ? tte->type() == BOUND_EXACT
- : ttValue >= beta ? (tte->type() & BOUND_LOWER)
- : (tte->type() & BOUND_UPPER)))
+ && ( PvNode ? tte->bound() == BOUND_EXACT
+ : ttValue >= beta ? (tte->bound() & BOUND_LOWER)
+ : (tte->bound() & BOUND_UPPER)))
{
TT.refresh(tte);
ss->currentMove = ttMove; // Can be MOVE_NONE
// Can ttValue be used as a better position evaluation?
if (ttValue != VALUE_NONE)
- if ( ((tte->type() & BOUND_LOWER) && ttValue > eval)
- || ((tte->type() & BOUND_UPPER) && ttValue < eval))
+ if ( ((tte->bound() & BOUND_LOWER) && ttValue > eval)
+ || ((tte->bound() & BOUND_UPPER) && ttValue < eval))
eval = ttValue;
}
else
// Update gain for the parent non-capture move given the static position
// evaluation before and after the move.
- if ( (move = (ss-1)->currentMove) != MOVE_NULL
- && (ss-1)->staticEval != VALUE_NONE
+ if ( !pos.captured_piece_type()
&& ss->staticEval != VALUE_NONE
- && !pos.captured_piece_type()
+ && (ss-1)->staticEval != VALUE_NONE
+ && (move = (ss-1)->currentMove) != MOVE_NULL
&& type_of(move) == NORMAL)
{
Square to = to_sq(move);
pos.do_null_move(st);
(ss+1)->skipNullMove = true;
nullValue = depth-R < ONE_PLY ? -qsearch<NonPV, false>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
- : - search<NonPV>(pos, ss+1, -beta, -alpha, depth-R);
+ : - search<NonPV>(pos, ss+1, -beta, -alpha, depth-R, !cutNode);
(ss+1)->skipNullMove = false;
pos.undo_null_move();
// Do verification search at high depths
ss->skipNullMove = true;
- Value v = search<NonPV>(pos, ss, alpha, beta, depth-R);
+ Value v = search<NonPV>(pos, ss, alpha, beta, depth-R, false);
ss->skipNullMove = false;
if (v >= beta)
&& depth >= 5 * ONE_PLY
&& !inCheck
&& !ss->skipNullMove
- && excludedMove == MOVE_NONE
&& abs(beta) < VALUE_MATE_IN_MAX_PLY)
{
Value rbeta = beta + 200;
{
ss->currentMove = move;
pos.do_move(move, st, ci, pos.move_gives_check(move, ci));
- value = -search<NonPV>(pos, ss+1, -rbeta, -rbeta+1, rdepth);
+ value = -search<NonPV>(pos, ss+1, -rbeta, -rbeta+1, rdepth, !cutNode);
pos.undo_move(move);
if (value >= rbeta)
return value;
Depth d = depth - 2 * ONE_PLY - (PvNode ? DEPTH_ZERO : depth / 4);
ss->skipNullMove = true;
- search<PvNode ? PV : NonPV>(pos, ss, alpha, beta, d);
+ search<PvNode ? PV : NonPV>(pos, ss, alpha, beta, d, true);
ss->skipNullMove = false;
tte = TT.probe(posKey);
&& depth >= (PvNode ? 6 * ONE_PLY : 8 * ONE_PLY)
&& ttMove != MOVE_NONE
&& !excludedMove // Recursive singular search is not allowed
- && (tte->type() & BOUND_LOWER)
+ && (tte->bound() & BOUND_LOWER)
&& tte->depth() >= depth - 3 * ONE_PLY;
// Step 11. Loop through moves
Value rBeta = ttValue - int(depth);
ss->excludedMove = move;
ss->skipNullMove = true;
- value = search<NonPV>(pos, ss, rBeta - 1, rBeta, depth / 2);
+ value = search<NonPV>(pos, ss, rBeta - 1, rBeta, depth / 2, cutNode);
ss->skipNullMove = false;
ss->excludedMove = MOVE_NONE;
pvMove = PvNode && moveCount == 1;
ss->currentMove = move;
- if (!SpNode && !captureOrPromotion && playedMoveCount < 64)
- movesSearched[playedMoveCount++] = move;
+ if (!SpNode && !captureOrPromotion && quietCount < 64)
+ quietsSearched[quietCount++] = move;
// Step 14. Make the move
pos.do_move(move, st, ci, givesCheck);
&& move != ss->killers[1])
{
ss->reduction = reduction<PvNode>(depth, moveCount);
+
+ if (!PvNode && cutNode)
+ ss->reduction += ONE_PLY;
+
if (move == countermoves[0] || move == countermoves[1])
ss->reduction = std::max(DEPTH_ZERO, ss->reduction-ONE_PLY);
if (SpNode)
alpha = splitPoint->alpha;
- value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d);
+ value = -search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, true);
doFullDepthSearch = (value > alpha && ss->reduction != DEPTH_ZERO);
ss->reduction = DEPTH_ZERO;
value = newDepth < ONE_PLY ?
givesCheck ? -qsearch<NonPV, true>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO)
: -qsearch<NonPV, false>(pos, ss+1, -(alpha+1), -alpha, DEPTH_ZERO)
- : - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth);
+ : - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, newDepth, !cutNode);
}
// Only for PV nodes do a full PV search on the first move or after a fail
value = newDepth < ONE_PLY ?
givesCheck ? -qsearch<PV, true>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
: -qsearch<PV, false>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
- : - search<PV>(pos, ss+1, -beta, -alpha, newDepth);
+ : - search<PV>(pos, ss+1, -beta, -alpha, newDepth, false);
// Step 17. Undo move
pos.undo_move(move);
assert(bestValue < beta);
thisThread->split<FakeSplit>(pos, ss, alpha, beta, &bestValue, &bestMove,
- depth, threatMove, moveCount, &mp, NT);
+ depth, threatMove, moveCount, &mp, NT, cutNode);
if (bestValue >= beta)
break;
}
// If we have pruned all the moves without searching return a fail-low score
if (bestValue == -VALUE_INFINITE)
- {
- assert(!playedMoveCount);
-
bestValue = alpha;
- }
- if (bestValue >= beta) // Failed high
+ TT.store(posKey, value_to_tt(bestValue, ss->ply),
+ bestValue >= beta ? BOUND_LOWER :
+ PvNode && bestMove ? BOUND_EXACT : BOUND_UPPER,
+ depth, bestMove, ss->staticEval, ss->evalMargin);
+
+ // Quiet best move: update killers, history and countermoves
+ if ( bestValue >= beta
+ && !pos.is_capture_or_promotion(bestMove)
+ && !inCheck)
{
- TT.store(posKey, value_to_tt(bestValue, ss->ply), BOUND_LOWER, depth,
- bestMove, ss->staticEval, ss->evalMargin);
-
- if (!pos.is_capture_or_promotion(bestMove) && !inCheck)
+ if (ss->killers[0] != bestMove)
{
- if (bestMove != ss->killers[0])
- {
- ss->killers[1] = ss->killers[0];
- ss->killers[0] = bestMove;
- }
-
- // Increase history value of the cut-off move
- Value bonus = Value(int(depth) * int(depth));
- History.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
- if (is_ok((ss-1)->currentMove))
- Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);
+ ss->killers[1] = ss->killers[0];
+ ss->killers[0] = bestMove;
+ }
- // Decrease history of all the other played non-capture moves
- for (int i = 0; i < playedMoveCount - 1; i++)
- {
- Move m = movesSearched[i];
- History.update(pos.piece_moved(m), to_sq(m), -bonus);
- }
+ // Increase history value of the cut-off move and decrease all the other
+ // played non-capture moves.
+ Value bonus = Value(int(depth) * int(depth));
+ History.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
+ for (int i = 0; i < quietCount - 1; i++)
+ {
+ Move m = quietsSearched[i];
+ History.update(pos.piece_moved(m), to_sq(m), -bonus);
}
+
+ if (is_ok((ss-1)->currentMove))
+ Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);
}
- else // Failed low or PV search
- TT.store(posKey, value_to_tt(bestValue, ss->ply),
- PvNode && bestMove != MOVE_NONE ? BOUND_EXACT : BOUND_UPPER,
- depth, bestMove, ss->staticEval, ss->evalMargin);
assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);
ttDepth = InCheck || depth >= DEPTH_QS_CHECKS ? DEPTH_QS_CHECKS
: DEPTH_QS_NO_CHECKS;
- // Transposition table lookup. At PV nodes, we don't use the TT for
- // pruning, but only for move ordering.
+ // Transposition table lookup
posKey = pos.key();
tte = TT.probe(posKey);
ttMove = tte ? tte->move() : MOVE_NONE;
if ( tte
&& tte->depth() >= ttDepth
&& ttValue != VALUE_NONE // Only in case of TT access race
- && ( PvNode ? tte->type() == BOUND_EXACT
- : ttValue >= beta ? (tte->type() & BOUND_LOWER)
- : (tte->type() & BOUND_UPPER)))
+ && ( PvNode ? tte->bound() == BOUND_EXACT
+ : ttValue >= beta ? (tte->bound() & BOUND_LOWER)
+ : (tte->bound() & BOUND_UPPER)))
{
ss->currentMove = ttMove; // Can be MOVE_NONE
return ttValue;
void RootMove::extract_pv_from_tt(Position& pos) {
StateInfo state[MAX_PLY_PLUS_2], *st = state;
- TTEntry* tte;
+ const TTEntry* tte;
int ply = 0;
Move m = pv[0];
void RootMove::insert_pv_in_tt(Position& pos) {
StateInfo state[MAX_PLY_PLUS_2], *st = state;
- TTEntry* tte;
+ const TTEntry* tte;
int ply = 0;
do {
switch (sp->nodeType) {
case Root:
- search<SplitPointRoot>(pos, ss, sp->alpha, sp->beta, sp->depth);
+ search<SplitPointRoot>(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode);
break;
case PV:
- search<SplitPointPV>(pos, ss, sp->alpha, sp->beta, sp->depth);
+ search<SplitPointPV>(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode);
break;
case NonPV:
- search<SplitPointNonPV>(pos, ss, sp->alpha, sp->beta, sp->depth);
+ search<SplitPointNonPV>(pos, ss, sp->alpha, sp->beta, sp->depth, sp->cutNode);
break;
default:
assert(false);
projects / stockfish / blobdiff