X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=496df5db93f18d553f2634bcdcfa07a927fabea4;hp=727990dc9d354b753004ae37b61afd7f2c1d28ad;hb=4095ff0ee51bdc76c247bd11d5f3a7008974e2ad;hpb=7e9f776fcafe0121c7449f4339b26d77c14adf50 diff --git a/src/search.cpp b/src/search.cpp index 727990dc..496df5db 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -674,8 +674,7 @@ namespace { if ( !PvNode && depth < 4 * ONE_PLY && eval + razor_margin(depth) <= alpha - && ttMove == MOVE_NONE - && !pos.pawn_on_7th(pos.side_to_move())) + && ttMove == MOVE_NONE) { if ( depth <= ONE_PLY && eval + razor_margin(3 * ONE_PLY) <= alpha) @@ -959,10 +958,9 @@ moves_loop: // When in check and at SpNode search starts from here [pos.piece_on(to_sq(move))][to_sq(move)] <= VALUE_ZERO)) ss->reduction += ONE_PLY; - if ( move == countermove - || ( History[pos.piece_on(to_sq(move))][to_sq(move)] > VALUE_ZERO - && CounterMovesHistory[pos.piece_on(prevMoveSq)][prevMoveSq] - [pos.piece_on(to_sq(move))][to_sq(move)] > VALUE_ZERO)) + if ( History[pos.piece_on(to_sq(move))][to_sq(move)] > VALUE_ZERO + && CounterMovesHistory[pos.piece_on(prevMoveSq)][prevMoveSq] + [pos.piece_on(to_sq(move))][to_sq(move)] > VALUE_ZERO) ss->reduction = std::max(DEPTH_ZERO, ss->reduction - ONE_PLY); // Decrease reduction for moves that escape a capture @@ -1428,7 +1426,7 @@ moves_loop: // When in check and at SpNode search starts from here } // Extra penalty for TT move in previous ply when it gets refuted - if (is_ok((ss-2)->currentMove) && (ss-1)->currentMove == (ss-1)->ttMove) + if (is_ok((ss-2)->currentMove) && (ss-1)->currentMove == (ss-1)->ttMove && !pos.captured_piece_type()) { Square prevPrevSq = to_sq((ss-2)->currentMove); HistoryStats& ttMoveCmh = CounterMovesHistory[pos.piece_on(prevPrevSq)][prevPrevSq];