X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=f0ee1b2b90f628c389627c29a989c98936017322;hp=c6d63c7bd2148ebfaa266b01b569dcfa7eb7d9c4;hb=5f096e9bef7dd2fa5506066f38a477944aa715cc;hpb=71bfbb22fce23f56b57d69b59a5cec1ff4b5aa03 diff --git a/src/search.cpp b/src/search.cpp index c6d63c7b..f0ee1b2b 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -606,7 +606,7 @@ namespace { Key posKey; Move ttMove, move, excludedMove, bestMove; Depth extension, newDepth, predictedDepth; - Value bestValue, value, ttValue, eval, nullValue, futilityValue; + Value bestValue, value, ttValue, eval, nullValue; bool ttHit, inCheck, givesCheck, singularExtensionNode, improving; bool captureOrPromotion, doFullDepthSearch; Piece moved_piece; @@ -971,16 +971,9 @@ moves_loop: // When in check search starts from here predictedDepth = std::max(newDepth - reduction(improving, depth, moveCount), DEPTH_ZERO); // Futility pruning: parent node - if (predictedDepth < 7 * ONE_PLY) - { - futilityValue = ss->staticEval + futility_margin(predictedDepth) + 256; - - if (futilityValue <= alpha) - { - bestValue = std::max(bestValue, futilityValue); - continue; - } - } + if ( predictedDepth < 7 * ONE_PLY + && ss->staticEval + futility_margin(predictedDepth) + 256 <= alpha) + continue; // Prune moves with negative SEE at low depths if (predictedDepth < 4 * ONE_PLY && pos.see_sign(move) < VALUE_ZERO) @@ -1019,19 +1012,18 @@ moves_loop: // When in check search starts from here if (!PvNode && cutNode) r += ONE_PLY; - // Decrease/increase reduction for moves with a good/bad history - int rHist = (val - 10000) / 20000; - r = std::max(DEPTH_ZERO, r - rHist * ONE_PLY); - // Decrease reduction for moves that escape a capture. Filter out // castling moves, because they are coded as "king captures rook" and // hence break make_move(). Also use see() instead of see_sign(), // because the destination square is empty. - if ( r - && type_of(move) == NORMAL - && type_of(pos.piece_on(to_sq(move))) != PAWN - && pos.see(make_move(to_sq(move), from_sq(move))) < VALUE_ZERO) - r = std::max(DEPTH_ZERO, r - ONE_PLY); + else if ( type_of(move) == NORMAL + && type_of(pos.piece_on(to_sq(move))) != PAWN + && pos.see(make_move(to_sq(move), from_sq(move))) < VALUE_ZERO) + r -= ONE_PLY; + + // Decrease/increase reduction for moves with a good/bad history + int rHist = (val - 10000) / 20000; + r = std::max(DEPTH_ZERO, r - rHist * ONE_PLY); Depth d = std::max(newDepth - r, ONE_PLY);