X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=b992d2353041f69b1579c064904fc5b15ce28cb3;hp=0b3b6fd6b0e4d1e88d9052036ce58e07f886d279;hb=c2d42ea8339b49e52a116e488214a14fda09d413;hpb=5b8ca1eee77b736c35b418b1cb11da9fc66f83e0 diff --git a/src/movepick.cpp b/src/movepick.cpp index 0b3b6fd6..b992d235 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -88,11 +88,14 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, killers[0].move = ss->killers[0]; killers[1].move = ss->killers[1]; - // Consider sligtly negative captures as good if at low - // depth and far from beta. + // Consider sligtly negative captures as good if at low depth and far from beta if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY) captureThreshold = -PawnValueMidgame; + // Consider negative captures as good if still enough to reach beta + else if (ss && ss->eval > beta) + captureThreshold = beta - ss->eval; + phasePtr = MainSearchTable; } @@ -229,7 +232,7 @@ void MovePicker::go_next_phase() { /// MovePicker::score_captures(), MovePicker::score_noncaptures() and /// MovePicker::score_evasions() assign a numerical move ordering score /// to each move in a move list. The moves with highest scores will be -/// picked first by get_next_move(). +/// picked first by next_move(). void MovePicker::score_captures() { // Winning and equal captures in the main search are ordered by MVV/LVA. @@ -297,14 +300,14 @@ void MovePicker::score_evasions() { } } -/// MovePicker::get_next_move() is the most important method of the MovePicker -/// class. It returns a new pseudo legal move every time it is called, until there +/// MovePicker::next_move() is the most important method of the MovePicker class. +/// It returns a new pseudo legal move every time it is called, until there /// are no more moves left. It picks the move with the biggest score from a list /// of generated moves taking care not to return the tt move if has already been /// searched previously. Note that this function is not thread safe so should be /// lock protected by caller when accessed through a shared MovePicker object. -Move MovePicker::get_next_move() { +Move MovePicker::next_move() { Move move;