// Futility margin
Value futility_margin(Depth d, bool improving) {
- return Value(147 * (d - improving));
+ return Value(168 * (d - improving));
}
// Reductions lookup table, initialized at startup
Depth reduction(bool i, Depth d, int mn, Value delta, Value rootDelta) {
int r = Reductions[d] * Reductions[mn];
- return (r + 1627 - int(delta) * 1024 / int(rootDelta)) / 1024 + (!i && r > 992);
+ return (r + 1463 - int(delta) * 1024 / int(rootDelta)) / 1024 + (!i && r > 1010);
}
constexpr int futility_move_count(bool improving, Depth depth) {
// History and stats update bonus, based on depth
int stat_bonus(Depth d) {
- return std::min((8 * d + 281) * d - 241 , 1949);
+ return std::min((9 * d + 270) * d - 311 , 2145);
}
// Add a small random component to draw evaluations to avoid 3-fold blindness
void Search::init() {
for (int i = 1; i < MAX_MOVES; ++i)
- Reductions[i] = int((21.14 + std::log(Threads.size()) / 2) * std::log(i));
+ Reductions[i] = int((20.81 + std::log(Threads.size()) / 2) * std::log(i));
}
multiPV = std::min(multiPV, rootMoves.size());
- complexityAverage.set(211, 1);
+ complexityAverage.set(202, 1);
trend = SCORE_ZERO;
- optimism[ us] = Value(33);
+ optimism[ us] = Value(39);
optimism[~us] = -optimism[us];
int searchAgainCounter = 0;
if (rootDepth >= 4)
{
Value prev = rootMoves[pvIdx].averageScore;
- delta = Value(19) + int(prev) * prev / 18321;
+ delta = Value(16) + int(prev) * prev / 19178;
alpha = std::max(prev - delta,-VALUE_INFINITE);
beta = std::min(prev + delta, VALUE_INFINITE);
// Adjust trend and optimism based on root move's previousScore
- int tr = sigmoid(prev, 4, 11, 92, 119, 1);
+ int tr = sigmoid(prev, 3, 8, 90, 125, 1);
trend = (us == WHITE ? make_score(tr, tr / 2)
: -make_score(tr, tr / 2));
- int opt = sigmoid(prev, 9, 18, 115, 12250, 187);
+ int opt = sigmoid(prev, 8, 17, 144, 13966, 183);
optimism[ us] = Value(opt);
optimism[~us] = -optimism[us];
}
&& !Threads.stop
&& !mainThread->stopOnPonderhit)
{
- double fallingEval = (66 + 12 * (mainThread->bestPreviousAverageScore - bestValue)
- + 6 * (mainThread->iterValue[iterIdx] - bestValue)) / 809.70;
+ double fallingEval = (69 + 12 * (mainThread->bestPreviousAverageScore - bestValue)
+ + 6 * (mainThread->iterValue[iterIdx] - bestValue)) / 781.4;
fallingEval = std::clamp(fallingEval, 0.5, 1.5);
// If the bestMove is stable over several iterations, reduce time accordingly
- timeReduction = lastBestMoveDepth + 8 < completedDepth ? 1.73 : 0.94;
- double reduction = (1.66 + mainThread->previousTimeReduction) / (2.35 * timeReduction);
+ timeReduction = lastBestMoveDepth + 10 < completedDepth ? 1.63 : 0.73;
+ double reduction = (1.56 + mainThread->previousTimeReduction) / (2.20 * timeReduction);
double bestMoveInstability = 1.073 + std::max(1.0, 2.25 - 9.9 / rootDepth)
* totBestMoveChanges / Threads.size();
int complexity = mainThread->complexityAverage.value();
- double complexPosition = std::clamp(1.0 + (complexity - 293) / 1525.0, 0.5, 1.5);
+ double complexPosition = std::clamp(1.0 + (complexity - 326) / 1618.1, 0.5, 1.5);
double totalTime = Time.optimum() * fallingEval * reduction * bestMoveInstability * complexPosition;
}
else if ( Threads.increaseDepth
&& !mainThread->ponder
- && Time.elapsed() > totalTime * 0.49)
+ && Time.elapsed() > totalTime * 0.43)
Threads.increaseDepth = false;
else
Threads.increaseDepth = true;
Depth extension, newDepth;
Value bestValue, value, ttValue, eval, maxValue, probCutBeta;
bool givesCheck, improving, didLMR, priorCapture;
- bool captureOrPromotion, doFullDepthSearch, moveCountPruning, ttCapture;
+ bool capture, doFullDepthSearch, moveCountPruning, ttCapture;
Piece movedPiece;
int moveCount, captureCount, quietCount, bestMoveCount, improvement, complexity;
ttValue = ss->ttHit ? value_from_tt(tte->value(), ss->ply, pos.rule50_count()) : VALUE_NONE;
ttMove = rootNode ? thisThread->rootMoves[thisThread->pvIdx].pv[0]
: ss->ttHit ? tte->move() : MOVE_NONE;
- ttCapture = ttMove && pos.capture_or_promotion(ttMove);
+ ttCapture = ttMove && pos.capture(ttMove);
if (!excludedMove)
ss->ttPv = PvNode || (ss->ttHit && tte->is_pv());
// margin and the improving flag are used in various pruning heuristics.
improvement = (ss-2)->staticEval != VALUE_NONE ? ss->staticEval - (ss-2)->staticEval
: (ss-4)->staticEval != VALUE_NONE ? ss->staticEval - (ss-4)->staticEval
- : 184;
+ : 175;
improving = improvement > 0;
complexity = abs(ss->staticEval - (us == WHITE ? eg_value(pos.psq_score()) : -eg_value(pos.psq_score())));
// If eval is really low check with qsearch if it can exceed alpha, if it can't,
// return a fail low.
if ( !PvNode
- && depth <= 6
- && eval < alpha - 486 - 314 * depth * depth)
+ && depth <= 7
+ && eval < alpha - 348 - 258 * depth * depth)
{
value = qsearch<NonPV>(pos, ss, alpha - 1, alpha);
if (value < alpha)
&& depth < 8
&& eval - futility_margin(depth, improving) - (ss-1)->statScore / 256 >= beta
&& eval >= beta
- && eval < 22266) // larger than VALUE_KNOWN_WIN, but smaller than TB wins.
+ && eval < 26305) // larger than VALUE_KNOWN_WIN, but smaller than TB wins.
return eval;
// Step 9. Null move search with verification search (~22 Elo)
if ( !PvNode
&& (ss-1)->currentMove != MOVE_NULL
- && (ss-1)->statScore < 15075
+ && (ss-1)->statScore < 14695
&& eval >= beta
&& eval >= ss->staticEval
- && ss->staticEval >= beta - 18 * depth - improvement / 19 + 215 + complexity / 30
+ && ss->staticEval >= beta - 15 * depth - improvement / 15 + 198 + complexity / 28
&& !excludedMove
&& pos.non_pawn_material(us)
&& (ss->ply >= thisThread->nmpMinPly || us != thisThread->nmpColor))
assert(eval - beta >= 0);
// Null move dynamic reduction based on depth, eval and complexity of position
- Depth R = std::min(int(eval - beta) / 184, 4) + depth / 3 + 4 - (complexity > 799);
+ Depth R = std::min(int(eval - beta) / 147, 5) + depth / 3 + 4 - (complexity > 753);
ss->currentMove = MOVE_NULL;
ss->continuationHistory = &thisThread->continuationHistory[0][0][NO_PIECE][0];
}
}
- probCutBeta = beta + 204 - 52 * improving;
+ probCutBeta = beta + 179 - 46 * improving;
// Step 10. ProbCut (~4 Elo)
// If we have a good enough capture and a reduced search returns a value
{
assert(probCutBeta < VALUE_INFINITE);
- MovePicker mp(pos, ttMove, probCutBeta - ss->staticEval, &captureHistory);
+ MovePicker mp(pos, ttMove, probCutBeta - ss->staticEval, depth - 3, &captureHistory);
bool ttPv = ss->ttPv;
+ bool captureOrPromotion;
ss->ttPv = false;
while ((move = mp.next_move()) != MOVE_NONE)
if (move != excludedMove && pos.legal(move))
{
- assert(pos.capture_or_promotion(move));
+ assert(pos.capture(move) || promotion_type(move) == QUEEN);
captureOrPromotion = true;
moves_loop: // When in check, search starts here
// Step 12. A small Probcut idea, when we are in check (~0 Elo)
- probCutBeta = beta + 401;
+ probCutBeta = beta + 481;
if ( ss->inCheck
&& !PvNode
&& depth >= 2
(ss+1)->pv = nullptr;
extension = 0;
- captureOrPromotion = pos.capture_or_promotion(move);
+ capture = pos.capture(move);
movedPiece = pos.moved_piece(move);
givesCheck = pos.gives_check(move);
// Reduced depth of the next LMR search
int lmrDepth = std::max(newDepth - reduction(improving, depth, moveCount, delta, thisThread->rootDelta), 0);
- if ( captureOrPromotion
+ if ( capture
|| givesCheck)
{
// Futility pruning for captures (~0 Elo)
if ( !pos.empty(to_sq(move))
&& !givesCheck
&& !PvNode
- && lmrDepth < 7
+ && lmrDepth < 6
&& !ss->inCheck
- && ss->staticEval + 424 + 138 * lmrDepth + PieceValue[EG][pos.piece_on(to_sq(move))]
- + captureHistory[movedPiece][to_sq(move)][type_of(pos.piece_on(to_sq(move)))] / 7 < alpha)
+ && ss->staticEval + 281 + 179 * lmrDepth + PieceValue[EG][pos.piece_on(to_sq(move))]
+ + captureHistory[movedPiece][to_sq(move)][type_of(pos.piece_on(to_sq(move)))] / 6 < alpha)
continue;
// SEE based pruning (~9 Elo)
- if (!pos.see_ge(move, Value(-214) * depth))
+ if (!pos.see_ge(move, Value(-203) * depth))
continue;
}
else
// Futility pruning: parent node (~9 Elo)
if ( !ss->inCheck
&& lmrDepth < 11
- && ss->staticEval + 147 + 125 * lmrDepth + history / 64 <= alpha)
+ && ss->staticEval + 122 + 138 * lmrDepth + history / 60 <= alpha)
continue;
// Prune moves with negative SEE (~3 Elo)
- if (!pos.see_ge(move, Value(-23 * lmrDepth * lmrDepth - 31 * lmrDepth)))
+ if (!pos.see_ge(move, Value(-25 * lmrDepth * lmrDepth - 20 * lmrDepth)))
continue;
}
}
// a reduced search on all the other moves but the ttMove and if the
// result is lower than ttValue minus a margin, then we will extend the ttMove.
if ( !rootNode
- && depth >= 6 + 2 * (PvNode && tte->is_pv())
+ && depth >= 4 + 2 * (PvNode && tte->is_pv())
&& move == ttMove
&& !excludedMove // Avoid recursive singular search
/* && ttValue != VALUE_NONE Already implicit in the next condition */
&& (tte->bound() & BOUND_LOWER)
&& tte->depth() >= depth - 3)
{
- Value singularBeta = ttValue - 4 * depth;
+ Value singularBeta = ttValue - 3 * depth;
Depth singularDepth = (depth - 1) / 2;
ss->excludedMove = move;
// Avoid search explosion by limiting the number of double extensions
if ( !PvNode
- && value < singularBeta - 52
+ && value < singularBeta - 26
&& ss->doubleExtensions <= 8)
extension = 2;
}
// Check extensions (~1 Elo)
else if ( givesCheck
- && depth > 8
- && abs(ss->staticEval) > 81)
+ && depth > 9
+ && abs(ss->staticEval) > 71)
extension = 1;
// Quiet ttMove extensions (~0 Elo)
else if ( PvNode
&& move == ttMove
&& move == ss->killers[0]
- && (*contHist[0])[movedPiece][to_sq(move)] >= 7546)
+ && (*contHist[0])[movedPiece][to_sq(move)] >= 5491)
extension = 1;
}
// Update the current move (this must be done after singular extension search)
ss->currentMove = move;
ss->continuationHistory = &thisThread->continuationHistory[ss->inCheck]
- [captureOrPromotion]
+ [capture]
[movedPiece]
[to_sq(move)];
// been searched. In general we would like to reduce them, but there are many
// cases where we extend a son if it has good chances to be "interesting".
if ( depth >= 2
- && moveCount > 1 + rootNode
+ && moveCount > 1 + (PvNode && ss->ply <= 1)
&& ( !ss->ttPv
- || !captureOrPromotion
+ || !capture
|| (cutNode && (ss-1)->moveCount > 1)))
{
Depth r = reduction(improving, depth, moveCount, delta, thisThread->rootDelta);
if (ttCapture)
r++;
+ // Decrease reduction at PvNodes if bestvalue
+ // is vastly different from static evaluation
+ if (PvNode && !ss->inCheck && abs(ss->staticEval - bestValue) > 250)
+ r--;
+
ss->statScore = thisThread->mainHistory[us][from_to(move)]
+ (*contHist[0])[movedPiece][to_sq(move)]
+ (*contHist[1])[movedPiece][to_sq(move)]
+ (*contHist[3])[movedPiece][to_sq(move)]
- - 4123;
+ - 4334;
// Decrease/increase reduction for moves with a good/bad history (~30 Elo)
- r -= ss->statScore / 17417;
+ r -= ss->statScore / 15914;
// In general we want to cap the LMR depth search at newDepth. But if reductions
// are really negative and movecount is low, we allow this move to be searched
// deeper than the first move (this may lead to hidden double extensions).
int deeper = r >= -1 ? 0
- : moveCount <= 5 ? 2
- : PvNode && depth > 3 ? 1
- : cutNode && moveCount <= 7 ? 1
+ : moveCount <= 4 ? 2
+ : PvNode && depth > 4 ? 1
+ : cutNode && moveCount <= 8 ? 1
: 0;
Depth d = std::clamp(newDepth - r, 1, newDepth + deeper);
// If the son is reduced and fails high it will be re-searched at full depth
doFullDepthSearch = value > alpha && d < newDepth;
- doDeeperSearch = value > (alpha + 76 + 11 * (newDepth - d));
+ doDeeperSearch = value > (alpha + 78 + 11 * (newDepth - d));
didLMR = true;
}
else
int bonus = value > alpha ? stat_bonus(newDepth)
: -stat_bonus(newDepth);
- if (captureOrPromotion)
+ if (capture)
bonus /= 6;
update_continuation_histories(ss, movedPiece, to_sq(move), bonus);
// If the move is worse than some previously searched move, remember it to update its stats later
if (move != bestMove)
{
- if (captureOrPromotion && captureCount < 32)
+ if (capture && captureCount < 32)
capturesSearched[captureCount++] = move;
- else if (!captureOrPromotion && quietCount < 64)
+ else if (!capture && quietCount < 64)
quietsSearched[quietCount++] = move;
}
}
//or fail low was really bad
bool extraBonus = PvNode
|| cutNode
- || bestValue < alpha - 71 * depth;
+ || bestValue < alpha - 70 * depth;
update_continuation_histories(ss-1, pos.piece_on(prevSq), prevSq, stat_bonus(depth) * (1 + extraBonus));
}
// opponent move is probably good and the new position is added to the search tree.
if (bestValue <= alpha)
ss->ttPv = ss->ttPv || ((ss-1)->ttPv && depth > 3);
- // Otherwise, a counter move has been found and if the position is the last leaf
- // in the search tree, remove the position from the search tree.
- else if (depth > 3)
- ss->ttPv = ss->ttPv && (ss+1)->ttPv;
// Write gathered information in transposition table
if (!excludedMove && !(rootNode && thisThread->pvIdx))
Move ttMove, move, bestMove;
Depth ttDepth;
Value bestValue, value, ttValue, futilityValue, futilityBase;
- bool pvHit, givesCheck, captureOrPromotion;
+ bool pvHit, givesCheck, capture;
int moveCount;
if (PvNode)
if (PvNode && bestValue > alpha)
alpha = bestValue;
- futilityBase = bestValue + 139;
+ futilityBase = bestValue + 118;
}
const PieceToHistory* contHist[] = { (ss-1)->continuationHistory, (ss-2)->continuationHistory,
continue;
givesCheck = pos.gives_check(move);
- captureOrPromotion = pos.capture_or_promotion(move);
+ capture = pos.capture(move);
moveCount++;
ss->currentMove = move;
ss->continuationHistory = &thisThread->continuationHistory[ss->inCheck]
- [captureOrPromotion]
+ [capture]
[pos.moved_piece(move)]
[to_sq(move)];
// Continuation history based pruning (~2 Elo)
- if ( !captureOrPromotion
+ if ( !capture
&& bestValue > VALUE_TB_LOSS_IN_MAX_PLY
&& (*contHist[0])[pos.moved_piece(move)][to_sq(move)] < CounterMovePruneThreshold
&& (*contHist[1])[pos.moved_piece(move)][to_sq(move)] < CounterMovePruneThreshold)
// movecount pruning for quiet check evasions
if ( bestValue > VALUE_TB_LOSS_IN_MAX_PLY
&& quietCheckEvasions > 1
- && !captureOrPromotion
+ && !capture
&& ss->inCheck)
continue;
- quietCheckEvasions += !captureOrPromotion && ss->inCheck;
+ quietCheckEvasions += !capture && ss->inCheck;
// Make and search the move
pos.do_move(move, st, givesCheck);
bonus2 = bestValue > beta + PawnValueMg ? bonus1 // larger bonus
: stat_bonus(depth); // smaller bonus
- if (!pos.capture_or_promotion(bestMove))
+ if (!pos.capture(bestMove))
{
// Increase stats for the best move in case it was a quiet move
update_quiet_stats(pos, ss, bestMove, bonus2);
projects / stockfish / blobdiff