X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=abb753baea75d118ae41cfecefdf38992050227d;hp=9611315c3a5aedc8c0e55f4d2d5fa23fa4ca3cd0;hb=1ceaea701baaa79f378b0842ff0fb5d2a1f53ef7;hpb=438805aee853de93b2ed0f24a51fae873509b885 diff --git a/src/movepick.cpp b/src/movepick.cpp index 9611315c..abb753ba 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -26,13 +26,12 @@ namespace { enum Stages { - MAIN_SEARCH, GOOD_CAPTURES_INIT, GOOD_CAPTURES, KILLERS, KILLERS_2, - QUIET_INIT, QUIET, BAD_CAPTURES, - EVASION, ALL_EVASIONS, - QSEARCH_WITH_CHECKS, QCAPTURES_CHECKS_INIT, QCAPTURES_CHECKS, CHECKS, - QSEARCH_WITHOUT_CHECKS, QCAPTURES_NO_CHECKS, REMAINING, - RECAPTURE, RECAPTURES, - PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES + MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES, + EVASION, EVASIONS_INIT, ALL_EVASIONS, + PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES, + QSEARCH_WITH_CHECKS, QCAPTURES_1_INIT, QCAPTURES_1, QCHECKS, + QSEARCH_NO_CHECKS, QCAPTURES_2_INIT, QCAPTURES_2, + QSEARCH_RECAPTURES, QRECAPTURES }; // Our insertion sort, which is guaranteed to be stable, as it should be @@ -92,11 +91,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s) stage = QSEARCH_WITH_CHECKS; else if (d > DEPTH_QS_RECAPTURES) - stage = QSEARCH_WITHOUT_CHECKS; + stage = QSEARCH_NO_CHECKS; else { - stage = RECAPTURE; + stage = QSEARCH_RECAPTURES; recaptureSquare = s; return; } @@ -112,11 +111,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th) stage = PROBCUT; - // In ProbCut we generate captures with SEE higher than the given threshold + // In ProbCut we generate captures with SEE higher than or equal to the given threshold ttMove = ttm && pos.pseudo_legal(ttm) && pos.capture(ttm) - && pos.see(ttm) > threshold ? ttm : MOVE_NONE; + && pos.see_ge(ttm, threshold)? ttm : MOVE_NONE; stage += (ttMove == MOVE_NONE); } @@ -160,30 +159,19 @@ void MovePicker::score() { template<> void MovePicker::score() { - // Try winning and equal captures ordered by MVV/LVA, then non-captures ordered - // by history value, then bad captures and quiet moves with a negative SEE ordered - // by SEE value. + // Try captures ordered by MVV/LVA, then non-captures ordered by history value const HistoryStats& history = pos.this_thread()->history; const FromToStats& fromTo = pos.this_thread()->fromTo; Color c = pos.side_to_move(); - Value see; for (auto& m : *this) - if ((see = pos.see_sign(m)) < VALUE_ZERO) - m.value = see - HistoryStats::Max; // At the bottom - - else if (pos.capture(m)) + if (pos.capture(m)) m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max; else m.value = history[pos.moved_piece(m)][to_sq(m)] + fromTo.get(c, m); } -int MovePicker::see_sign() const -{ - return stage == GOOD_CAPTURES ? 1 - : stage == BAD_CAPTURES ? -1 : 0; -} /// 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 @@ -197,11 +185,11 @@ Move MovePicker::next_move() { switch (stage) { case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS: - case QSEARCH_WITHOUT_CHECKS: case PROBCUT: + case QSEARCH_NO_CHECKS: case PROBCUT: ++stage; return ttMove; - case GOOD_CAPTURES_INIT: + case CAPTURES_INIT: endBadCaptures = cur = moves; endMoves = generate(pos, cur); score(); @@ -213,17 +201,16 @@ Move MovePicker::next_move() { move = pick_best(cur++, endMoves); if (move != ttMove) { - if (pos.see_sign(move) >= VALUE_ZERO) + if (pos.see_ge(move, VALUE_ZERO)) return move; // Losing capture, move it to the beginning of the array *endBadCaptures++ = move; } } - ++stage; - // First killer move - move = ss->killers[0]; + ++stage; + move = ss->killers[0]; // First killer move if ( move != MOVE_NONE && move != ttMove && pos.pseudo_legal(move) @@ -239,7 +226,7 @@ Move MovePicker::next_move() { && !pos.capture(move)) return move; - case KILLERS_2: + case COUNTERMOVE: ++stage; move = countermove; if ( move != MOVE_NONE @@ -281,72 +268,76 @@ Move MovePicker::next_move() { return *cur++; break; - case ALL_EVASIONS: + case EVASIONS_INIT: cur = moves; endMoves = generate(pos, cur); - if (endMoves - cur > 1) - score(); - stage = REMAINING; - goto remaining; - - case QCAPTURES_CHECKS_INIT: - case QCAPTURES_NO_CHECKS: - cur = moves; - endMoves = generate(pos, cur); - score(); + score(); ++stage; -remaining: - case QCAPTURES_CHECKS: - case REMAINING: + case ALL_EVASIONS: while (cur < endMoves) { move = pick_best(cur++, endMoves); if (move != ttMove) return move; } - if (stage == REMAINING) - break; + break; + + case PROBCUT_INIT: cur = moves; - endMoves = generate(pos, cur); + endMoves = generate(pos, cur); + score(); ++stage; - case CHECKS: + case PROBCUT_CAPTURES: while (cur < endMoves) { - move = cur++->move; - if (move != ttMove) + move = pick_best(cur++, endMoves); + if ( move != ttMove + && pos.see_ge(move, threshold)) return move; } break; - case RECAPTURE: + case QCAPTURES_1_INIT: case QCAPTURES_2_INIT: cur = moves; endMoves = generate(pos, cur); score(); ++stage; - case RECAPTURES: + case QCAPTURES_1: case QCAPTURES_2: while (cur < endMoves) { move = pick_best(cur++, endMoves); - if (to_sq(move) == recaptureSquare) + if (move != ttMove) + return move; + } + if (stage == QCAPTURES_2) + break; + cur = moves; + endMoves = generate(pos, cur); + ++stage; + + case QCHECKS: + while (cur < endMoves) + { + move = cur++->move; + if (move != ttMove) return move; } break; - case PROBCUT_INIT: + case QSEARCH_RECAPTURES: cur = moves; endMoves = generate(pos, cur); score(); ++stage; - case PROBCUT_CAPTURES: + case QRECAPTURES: while (cur < endMoves) { move = pick_best(cur++, endMoves); - if ( move != ttMove - && pos.see(move) > threshold) + if (to_sq(move) == recaptureSquare) return move; } break;