X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=55a689567b4029cdb6c5f13c6f0b27c2103989b3;hb=67d06164833857d3497010e952fd0d2c5f00c095;hp=39bb1fdb94867728840b0653658da19645bb1de7;hpb=6847be2c752b3f41906be87af7f3cde4e31be5d5;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index 39bb1fdb..55a68956 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -588,7 +588,7 @@ namespace { Value bestValue, value, ttValue, eval, maxValue, probCutBeta; bool givesCheck, improving, didLMR, priorCapture; bool captureOrPromotion, doFullDepthSearch, moveCountPruning, - ttCapture, singularQuietLMR, noLMRExtension; + ttCapture, singularQuietLMR; Piece movedPiece; int moveCount, captureCount, quietCount, bestMoveCount, improvement; @@ -893,19 +893,16 @@ namespace { assert(probCutBeta < VALUE_INFINITE); MovePicker mp(pos, ttMove, probCutBeta - ss->staticEval, &captureHistory); - int probCutCount = 0; bool ttPv = ss->ttPv; ss->ttPv = false; - while ( (move = mp.next_move()) != MOVE_NONE - && probCutCount < 2 + 2 * cutNode) + while ((move = mp.next_move()) != MOVE_NONE) if (move != excludedMove && pos.legal(move)) { assert(pos.capture_or_promotion(move)); assert(depth >= 5); captureOrPromotion = true; - probCutCount++; ss->currentMove = move; ss->continuationHistory = &thisThread->continuationHistory[ss->inCheck] @@ -984,7 +981,7 @@ moves_loop: // When in check, search starts here ss->ply); value = bestValue; - singularQuietLMR = moveCountPruning = noLMRExtension = false; + singularQuietLMR = moveCountPruning = false; // Indicate PvNodes that will probably fail low if the node was searched // at a depth equal or greater than the current depth, and the result of this search was a fail low. @@ -1108,10 +1105,7 @@ moves_loop: // When in check, search starts here if ( !PvNode && value < singularBeta - 75 && ss->doubleExtensions <= 6) - { extension = 2; - noLMRExtension = true; - } } // Multi-cut pruning @@ -1221,7 +1215,6 @@ moves_loop: // When in check, search starts here // 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 - : noLMRExtension ? 0 : moveCount <= 3 && r <= -3 ? 2 : moveCount <= 5 ? 1 : PvNode && depth > 6 ? 1