X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=10835e6872e832a06d36e51e77f22c93757c2d64;hp=6bb5c315554abab89fe17896af79e7427af2e980;hb=a9e9746495821fe7251d5f86ea3a97cb91eac729;hpb=2e70a2873f42e327546248172baa77a76ae0b0fc diff --git a/src/movepick.cpp b/src/movepick.cpp index 6bb5c315..10835e68 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2009 Marco Costalba + Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -71,10 +71,11 @@ namespace { /// move ordering is at the current node. MovePicker::MovePicker(const Position& p, Move ttm, Depth d, - const History& h, SearchStack* ss) : pos(p), H(h) { + const History& h, SearchStack* ss, Value beta) : pos(p), H(h) { int searchTT = ttm; ttMoves[0].move = ttm; lastBadCapture = badCaptures; + badCaptureThreshold = 0; pinned = p.pinned_pieces(pos.side_to_move()); @@ -90,8 +91,14 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, if (p.is_check()) phasePtr = EvasionsPhaseTable; else if (d > Depth(0)) + { + // Consider sligtly negative captures as good if at low + // depth and far from beta. + if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * OnePly) + badCaptureThreshold = -PawnValueMidgame; + phasePtr = MainSearchPhaseTable; - else if (d == Depth(0)) + } else if (d == Depth(0)) phasePtr = QsearchWithChecksPhaseTable; else { @@ -290,7 +297,7 @@ Move MovePicker::get_next_move() { { // Check for a non negative SEE now int seeValue = pos.see_sign(move); - if (seeValue >= 0) + if (seeValue >= badCaptureThreshold) return move; // Losing capture, move it to the badCaptures[] array, note