constexpr uint64_t ttHitAverageResolution = 1024;
// Razor and futility margins
- constexpr int RazorMargin = 661;
+ constexpr int RazorMargin = 531;
Value futility_margin(Depth d, bool improving) {
- return Value(198 * (d - improving));
+ return Value(217 * (d - improving));
}
// Reductions lookup table, initialized at startup
Depth reduction(bool i, Depth d, int mn) {
int r = Reductions[d] * Reductions[mn];
- return (r + 520) / 1024 + (!i && r > 999);
+ return (r + 511) / 1024 + (!i && r > 1007);
}
constexpr int futility_move_count(bool improving, Depth depth) {
// History and stats update bonus, based on depth
int stat_bonus(Depth d) {
- return d > 17 ? -8 : 22 * d * d + 151 * d - 140;
+ return d > 15 ? -8 : 19 * d * d + 155 * d - 132;
}
// Add a small random component to draw evaluations to avoid 3fold-blindness
void Search::init() {
for (int i = 1; i < MAX_MOVES; ++i)
- Reductions[i] = int((23.4 + std::log(Threads.size()) / 2) * std::log(i));
+ Reductions[i] = int((24.8 + std::log(Threads.size()) / 2) * std::log(i));
}
MainThread* mainThread = (this == Threads.main() ? Threads.main() : nullptr);
double timeReduction = 1, totBestMoveChanges = 0;
Color us = rootPos.side_to_move();
+ int iterIdx = 0;
std::memset(ss-7, 0, 10 * sizeof(Stack));
for (int i = 7; i > 0; i--)
bestValue = delta = alpha = -VALUE_INFINITE;
beta = VALUE_INFINITE;
+ if (mainThread)
+ {
+ if (mainThread->previousScore == VALUE_INFINITE)
+ for (int i=0; i<4; ++i)
+ mainThread->iterValue[i] = VALUE_ZERO;
+ else
+ for (int i=0; i<4; ++i)
+ mainThread->iterValue[i] = mainThread->previousScore;
+ }
+
size_t multiPV = Options["MultiPV"];
// Pick integer skill levels, but non-deterministically round up or down
if (rootDepth >= 4)
{
Value previousScore = rootMoves[pvIdx].previousScore;
- delta = Value(21 + abs(previousScore) / 128);
+ delta = Value(21 + abs(previousScore) / 256);
alpha = std::max(previousScore - delta,-VALUE_INFINITE);
beta = std::min(previousScore + delta, VALUE_INFINITE);
// Adjust contempt based on root move's previousScore (dynamic contempt)
- int dct = ct + (111 - ct / 2) * previousScore / (abs(previousScore) + 176);
+ int dct = ct + (102 - ct / 2) * previousScore / (abs(previousScore) + 157);
contempt = (us == WHITE ? make_score(dct, dct / 2)
: -make_score(dct, dct / 2));
&& !Threads.stop
&& !mainThread->stopOnPonderhit)
{
- double fallingEval = (354 + 10 * (mainThread->previousScore - bestValue)) / 692.0;
+ double fallingEval = (332 + 6 * (mainThread->previousScore - bestValue)
+ + 6 * (mainThread->iterValue[iterIdx] - bestValue)) / 704.0;
fallingEval = clamp(fallingEval, 0.5, 1.5);
// If the bestMove is stable over several iterations, reduce time accordingly
- timeReduction = lastBestMoveDepth + 9 < completedDepth ? 1.97 : 0.98;
- double reduction = (1.36 + mainThread->previousTimeReduction) / (2.29 * timeReduction);
+ timeReduction = lastBestMoveDepth + 9 < completedDepth ? 1.94 : 0.91;
+ double reduction = (1.41 + mainThread->previousTimeReduction) / (2.27 * timeReduction);
// Use part of the gained time from a previous stable move for the current move
for (Thread* th : Threads)
Threads.stop = true;
}
}
+
+ mainThread->iterValue[iterIdx] = bestValue;
+ iterIdx = (iterIdx + 1) & 3;
}
if (!mainThread)
&& eval <= alpha - RazorMargin)
return qsearch<NT>(pos, ss, alpha, beta);
- improving = ss->staticEval >= (ss-2)->staticEval
- || (ss-2)->staticEval == VALUE_NONE;
+ improving = (ss-2)->staticEval == VALUE_NONE ? (ss->staticEval >= (ss-4)->staticEval
+ || (ss-4)->staticEval == VALUE_NONE) : ss->staticEval >= (ss-2)->staticEval;
// Step 8. Futility pruning: child node (~30 Elo)
if ( !PvNode
- && depth < 7
+ && depth < 6
&& eval - futility_margin(depth, improving) >= beta
&& eval < VALUE_KNOWN_WIN) // Do not return unproven wins
return eval;
// Step 9. Null move search with verification search (~40 Elo)
if ( !PvNode
&& (ss-1)->currentMove != MOVE_NULL
- && (ss-1)->statScore < 22661
+ && (ss-1)->statScore < 23405
&& eval >= beta
&& eval >= ss->staticEval
- && ss->staticEval >= beta - 33 * depth + 299 - improving * 30
+ && ss->staticEval >= beta - 32 * depth + 317 - improving * 30
&& !excludedMove
&& pos.non_pawn_material(us)
&& (ss->ply >= thisThread->nmpMinPly || us != thisThread->nmpColor))
assert(eval - beta >= 0);
// Null move dynamic reduction based on depth and value
- Depth R = (835 + 70 * depth) / 256 + std::min(int(eval - beta) / 185, 3);
+ Depth R = (854 + 68 * depth) / 258 + std::min(int(eval - beta) / 192, 3);
ss->currentMove = MOVE_NULL;
ss->continuationHistory = &thisThread->continuationHistory[0][0][NO_PIECE][0];
&& depth >= 5
&& abs(beta) < VALUE_MATE_IN_MAX_PLY)
{
- Value raisedBeta = std::min(beta + 191 - 46 * improving, VALUE_INFINITE);
+ Value raisedBeta = std::min(beta + 189 - 45 * improving, VALUE_INFINITE);
MovePicker mp(pos, ttMove, raisedBeta - ss->staticEval, &thisThread->captureHistory);
int probCutCount = 0;
moveCountPruning = moveCount >= futility_move_count(improving, depth);
if ( !captureOrPromotion
- && !givesCheck
- && (!PvNode || !pos.advanced_pawn_push(move) || pos.non_pawn_material(~us) > BishopValueMg))
+ && !givesCheck)
{
// Reduced depth of the next LMR search
int lmrDepth = std::max(newDepth - reduction(improving, depth, moveCount), 0);
// Futility pruning: parent node (~2 Elo)
if ( lmrDepth < 6
&& !inCheck
- && ss->staticEval + 250 + 211 * lmrDepth <= alpha)
+ && ss->staticEval + 255 + 182 * lmrDepth <= alpha)
continue;
// Prune moves with negative SEE (~10 Elo)
- if (!pos.see_ge(move, Value(-(31 - std::min(lmrDepth, 18)) * lmrDepth * lmrDepth)))
+ if (!pos.see_ge(move, Value(-(32 - std::min(lmrDepth, 18)) * lmrDepth * lmrDepth)))
continue;
}
- else if (!pos.see_ge(move, Value(-199) * depth)) // (~20 Elo)
+ else if (!pos.see_ge(move, Value(-194) * depth)) // (~20 Elo)
continue;
}
// search without the ttMove. So we assume this expected Cut-node is not singular,
// that multiple moves fail high, and we can prune the whole subtree by returning
// a soft bound.
- else if ( eval >= beta
- && singularBeta >= beta)
+ else if (singularBeta >= beta)
return singularBeta;
}
&& pos.pawn_passed(us, to_sq(move)))
extension = 1;
+ // Last captures extension
+ else if ( PieceValue[EG][pos.captured_piece()] > PawnValueEg
+ && pos.non_pawn_material() <= 2 * RookValueMg)
+ extension = 1;
+
// Castling extension
if (type_of(move) == CASTLING)
extension = 1;
&& ( !captureOrPromotion
|| moveCountPruning
|| ss->staticEval + PieceValue[EG][pos.captured_piece()] <= alpha
- || cutNode))
+ || cutNode
+ || thisThread->ttHitAverage < 375 * ttHitAverageResolution * ttHitAverageWindow / 1024))
{
Depth r = reduction(improving, depth, moveCount);
// Decrease reduction if the ttHit running average is large
- if (thisThread->ttHitAverage > 544 * ttHitAverageResolution * ttHitAverageWindow / 1024)
+ if (thisThread->ttHitAverage > 500 * ttHitAverageResolution * ttHitAverageWindow / 1024)
r--;
// Reduction if other threads are searching this position.
r -= 2;
// Decrease reduction if opponent's move count is high (~10 Elo)
- if ((ss-1)->moveCount > 15)
+ if ((ss-1)->moveCount > 14)
r--;
// Decrease reduction if ttMove has been singularly extended
+ (*contHist[0])[movedPiece][to_sq(move)]
+ (*contHist[1])[movedPiece][to_sq(move)]
+ (*contHist[3])[movedPiece][to_sq(move)]
- - 4729;
+ - 4926;
// Reset statScore to zero if negative and most stats shows >= 0
if ( ss->statScore < 0
ss->statScore = 0;
// Decrease/increase reduction by comparing opponent's stat score (~10 Elo)
- if (ss->statScore >= -99 && (ss-1)->statScore < -116)
+ if (ss->statScore >= -102 && (ss-1)->statScore < -114)
r--;
- else if ((ss-1)->statScore >= -117 && ss->statScore < -144)
+ else if ((ss-1)->statScore >= -116 && ss->statScore < -154)
r++;
// Decrease/increase reduction for moves with a good/bad history (~30 Elo)
if (PvNode && bestValue > alpha)
alpha = bestValue;
- futilityBase = bestValue + 153;
+ futilityBase = bestValue + 154;
}
const PieceToHistory* contHist[] = { (ss-1)->continuationHistory, (ss-2)->continuationHistory,
&& !pos.capture(move);
// Don't search moves with negative SEE values
- if ( (!inCheck || evasionPrunable)
- && !(givesCheck && pos.is_discovery_check_on_king(~pos.side_to_move(), move))
- && !pos.see_ge(move))
+ if ( (!inCheck || evasionPrunable) && !pos.see_ge(move))
continue;
// Speculative prefetch as early as possible
for (size_t i = 0; i < multiPV; ++i)
{
- bool updated = (i <= pvIdx && rootMoves[i].score != -VALUE_INFINITE);
+ bool updated = rootMoves[i].score != -VALUE_INFINITE;
if (depth == 1 && !updated)
continue;
projects / stockfish / blobdiff