X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=3eb8e9e1ee867e0595b6b2a247fe13db633575c5;hb=135caee606c86ade9e9c199ef469661c374eb9ba;hp=10a9027b94922cd1982a35b2e42957be22f42564;hpb=73018a03375b4b72ee482eb5a4a2152d7e4f0aac;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index 10a9027b..3eb8e9e1 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -69,9 +69,9 @@ namespace { // Reductions lookup table, initialized at startup int Reductions[MAX_MOVES]; // [depth or moveNumber] - Depth reduction(bool i, Depth d, int mn) { + Depth reduction(bool i, Depth d, int mn, bool rangeReduction) { int r = Reductions[d] * Reductions[mn]; - return (r + 534) / 1024 + (!i && r > 904); + return (r + 534) / 1024 + (!i && r > 904) + rangeReduction; } constexpr int futility_move_count(bool improving, Depth depth) { @@ -173,7 +173,7 @@ namespace { void Search::init() { for (int i = 1; i < MAX_MOVES; ++i) - Reductions[i] = int(21.9 * std::log(i)); + Reductions[i] = int((21.9 + std::log(Threads.size()) / 2) * std::log(i)); } @@ -954,6 +954,7 @@ namespace { moves_loop: // When in check, search starts here ttCapture = ttMove && pos.capture_or_promotion(ttMove); + int rangeReduction = 0; // Step 11. A small Probcut idea, when we are in check probCutBeta = beta + 409; @@ -1041,7 +1042,7 @@ moves_loop: // When in check, search starts here moveCountPruning = moveCount >= futility_move_count(improving, depth); // Reduced depth of the next LMR search - int lmrDepth = std::max(newDepth - reduction(improving, depth, moveCount), 0); + int lmrDepth = std::max(newDepth - reduction(improving, depth, moveCount, rangeReduction > 2), 0); if ( captureOrPromotion || givesCheck) @@ -1107,8 +1108,8 @@ moves_loop: // When in check, search starts here // Avoid search explosion by limiting the number of double extensions if ( !PvNode - && value < singularBeta - 93 - && ss->doubleExtensions < 3) + && value < singularBeta - 75 + && ss->doubleExtensions <= 6) { extension = 2; noLMRExtension = true; @@ -1124,7 +1125,8 @@ moves_loop: // When in check, search starts here return singularBeta; // If the eval of ttMove is greater than beta we try also if there is another - // move that pushes it over beta, if so also produce a cutoff. + // move that pushes it over beta, if so the position also has probably multiple + // moves giving fail highs. We will then reduce the ttMove (negative extension). else if (ttValue >= beta) { ss->excludedMove = move; @@ -1132,7 +1134,7 @@ moves_loop: // When in check, search starts here ss->excludedMove = MOVE_NONE; if (value >= beta) - return beta; + extension = -2; } } @@ -1145,7 +1147,14 @@ moves_loop: // When in check, search starts here // Check extensions else if ( givesCheck && depth > 6 - && abs(ss->staticEval) > Value(100)) + && abs(ss->staticEval) > 100) + extension = 1; + + // Quiet ttMove extensions + else if ( PvNode + && move == ttMove + && move == ss->killers[0] + && (*contHist[0])[movedPiece][to_sq(move)] >= 10000) extension = 1; // Add extension to new depth @@ -1176,7 +1185,7 @@ moves_loop: // When in check, search starts here || !ss->ttPv) && (!PvNode || ss->ply > 1 || thisThread->id() % 4 != 3)) { - Depth r = reduction(improving, depth, moveCount); + Depth r = reduction(improving, depth, moveCount, rangeReduction > 2); if (PvNode) r--; @@ -1221,11 +1230,10 @@ moves_loop: // When in check, search starts here // Decrease/increase reduction for moves with a good/bad history (~30 Elo) r -= ss->statScore / 14721; - // 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 in specific cases (note that - // this may lead to hidden double extensions if newDepth got it own extension - // before). + // 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 if + // newDepth got its own extension before). int deeper = r >= -1 ? 0 : noLMRExtension ? 0 : moveCount <= 5 ? 1 @@ -1236,6 +1244,10 @@ moves_loop: // When in check, search starts here value = -search(pos, ss+1, -(alpha+1), -alpha, d, true); + // Range reductions (~3 Elo) + if (ss->staticEval - value < 30 && depth > 7) + rangeReduction++; + // If the son is reduced and fails high it will be re-searched at full depth doFullDepthSearch = value > alpha && d < newDepth; didLMR = true;