X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=61e5527f42c61d638132201f0b2f2efd18bc999a;hp=12fffdccd1d5ab0399ccbbc16b3e94fc573041d6;hb=8647fbd6ed11c60282e84e4b486a7e8258c88483;hpb=cff8877a1ae270d6f176d16dbcfd72a270e0600f diff --git a/src/movepick.cpp b/src/movepick.cpp index 12fffdcc..61e5527f 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -28,11 +28,13 @@ namespace { enum MovegenPhase { - PH_TT_MOVES, // Transposition table move and mate killer - PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0 + PH_TT_MOVE, // Transposition table move + PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= captureThreshold (captureThreshold <= 0) + PH_GOOD_PROBCUT, // Queen promotions and captures with SEE values > captureThreshold (captureThreshold >= 0) PH_KILLERS, // Killer moves from the current ply - PH_NONCAPTURES, // Non-captures and underpromotions - PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0 + PH_NONCAPTURES_1, // Non-captures and underpromotions with positive score + PH_NONCAPTURES_2, // Non-captures and underpromotions with non-positive score + PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < captureThreshold (captureThreshold <= 0) PH_EVASIONS, // Check evasions PH_QCAPTURES, // Captures in quiescence search PH_QCHECKS, // Non-capture checks in quiescence search @@ -40,23 +42,22 @@ namespace { }; CACHE_LINE_ALIGNMENT - const uint8_t MainSearchTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP }; - const uint8_t EvasionTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP }; - const uint8_t QsearchWithChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP }; - const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP }; + const uint8_t MainSearchTable[] = { PH_TT_MOVE, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES_1, PH_NONCAPTURES_2, PH_BAD_CAPTURES, PH_STOP }; + const uint8_t EvasionTable[] = { PH_TT_MOVE, PH_EVASIONS, PH_STOP }; + const uint8_t QsearchWithChecksTable[] = { PH_TT_MOVE, PH_QCAPTURES, PH_QCHECKS, PH_STOP }; + const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVE, PH_QCAPTURES, PH_STOP }; + const uint8_t ProbCutTable[] = { PH_TT_MOVE, PH_GOOD_PROBCUT, PH_STOP }; } -bool MovePicker::isBadCapture() const { return phase == PH_BAD_CAPTURES; } - -/// Constructor for the MovePicker class. As arguments we pass information +/// Constructors for the MovePicker class. As arguments we pass information /// to help it to return the presumably good moves first, to decide which /// moves to return (in the quiescence search, for instance, we only want to /// search captures, promotions and some checks) and about how important good /// move ordering is at the current node. MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, - SearchStack* ss, Value beta) : pos(p), H(h) { - badCaptureThreshold = 0; + SearchStack* ss, Value beta) : pos(p), H(h), depth(d) { + captureThreshold = 0; badCaptures = moves + MAX_MOVES; assert(d > DEPTH_ZERO); @@ -74,7 +75,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, // Consider sligtly negative captures as good if at low // depth and far from beta. if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY) - badCaptureThreshold = -PawnValueMidgame; + captureThreshold = -PawnValueMidgame; phasePtr = MainSearchTable; } @@ -109,6 +110,24 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h) go_next_phase(); } +MovePicker::MovePicker(const Position& p, Move ttm, const History& h, int parentCapture) + : pos(p), H(h) { + + assert (!pos.in_check()); + + // In ProbCut we consider only captures better than parent's move + captureThreshold = parentCapture; + phasePtr = ProbCutTable; + + if ( ttm != MOVE_NONE + && (!pos.move_is_capture(ttm) || pos.see(ttm) <= captureThreshold)) + ttm = MOVE_NONE; + + ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE); + phasePtr += int(ttMove == MOVE_NONE) - 1; + go_next_phase(); +} + /// MovePicker::go_next_phase() generates, scores and sorts the next bunch /// of moves when there are no more moves to try for the current phase. @@ -119,11 +138,12 @@ void MovePicker::go_next_phase() { phase = *(++phasePtr); switch (phase) { - case PH_TT_MOVES: + case PH_TT_MOVE: lastMove = curMove + 1; return; case PH_GOOD_CAPTURES: + case PH_GOOD_PROBCUT: lastMove = generate(pos, moves); score_captures(); return; @@ -133,10 +153,17 @@ void MovePicker::go_next_phase() { lastMove = curMove + 2; return; - case PH_NONCAPTURES: - lastMove = generate(pos, moves); + case PH_NONCAPTURES_1: + lastNonCapture = lastMove = generate(pos, moves); score_noncaptures(); - sort_moves(moves, lastMove, &lastGoodNonCapture); + sort_moves(moves, lastNonCapture, &lastMove); + return; + + case PH_NONCAPTURES_2: + curMove = lastMove; + lastMove = lastNonCapture; + if (depth >= 3 * ONE_PLY) + insertion_sort(curMove, lastMove); return; case PH_BAD_CAPTURES: @@ -261,7 +288,7 @@ Move MovePicker::get_next_move() { switch (phase) { - case PH_TT_MOVES: + case PH_TT_MOVE: curMove++; return ttMove; break; @@ -270,9 +297,11 @@ Move MovePicker::get_next_move() { move = pick_best(curMove++, lastMove).move; if (move != ttMove) { + assert(captureThreshold <= 0); // Otherwise we must use see instead of see_sign + // Check for a non negative SEE now int seeValue = pos.see_sign(move); - if (seeValue >= badCaptureThreshold) + if (seeValue >= captureThreshold) return move; // Losing capture, move it to the tail of the array, note @@ -282,6 +311,13 @@ Move MovePicker::get_next_move() { } break; + case PH_GOOD_PROBCUT: + move = pick_best(curMove++, lastMove).move; + if ( move != ttMove + && pos.see(move) > captureThreshold) + return move; + break; + case PH_KILLERS: move = (curMove++)->move; if ( move != MOVE_NONE @@ -291,11 +327,8 @@ Move MovePicker::get_next_move() { return move; break; - case PH_NONCAPTURES: - // Sort negative scored moves only when we get there - if (curMove == lastGoodNonCapture) - insertion_sort(lastGoodNonCapture, lastMove); - + case PH_NONCAPTURES_1: + case PH_NONCAPTURES_2: move = (curMove++)->move; if ( move != ttMove && move != killers[0].move