X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=b82e68b66a8019160998e7c0880c71ef58bbac2a;hp=e0bd2a674025d0795955310c60758127509b4867;hb=13d4df95cd4c56c0e730328648de54d9ed8bd81e;hpb=333696318555004770f6d2acaae0eb743cc7e9de diff --git a/src/movepick.cpp b/src/movepick.cpp index e0bd2a67..b82e68b6 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-2014 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 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 @@ -30,12 +30,12 @@ namespace { EVASION, EVASIONS_S2, QSEARCH_0, CAPTURES_S3, QUIET_CHECKS_S3, QSEARCH_1, CAPTURES_S4, - MULTICUT, CAPTURES_S5, + PROBCUT, CAPTURES_S5, RECAPTURE, CAPTURES_S6, STOP }; - // Our insertion sort, which is guaranteed (and also needed) to be stable + // Our insertion sort, which is guaranteed to be stable, as it should be void insertion_sort(ExtMove* begin, ExtMove* end) { ExtMove tmp, *p, *q; @@ -49,19 +49,16 @@ namespace { } } - // Unary predicate used by std::partition to split positive scores from remaining - // ones so as to sort the two sets separately, with the second sort delayed. - inline bool has_positive_score(const ExtMove& ms) { return ms.score > 0; } - - // Picks the best move in the range (begin, end) and moves it to the front. - // It's faster than sorting all the moves in advance when there are few - // moves e.g. possible captures. - inline ExtMove* pick_best(ExtMove* begin, ExtMove* end) + // pick_best() finds the best move in the range (begin, end) and moves it to + // the front. It's faster than sorting all the moves in advance when there + // are few moves e.g. the possible captures. + inline Move pick_best(ExtMove* begin, ExtMove* end) { std::swap(*begin, *std::max_element(begin, end)); - return begin; + return *begin; } -} + +} // namespace /// Constructors of the MovePicker class. As arguments we pass information @@ -70,67 +67,59 @@ namespace { /// search captures, promotions and some checks) and how important good move /// ordering is at the current node. -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, - Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), depth(d) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh, + Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) { assert(d > DEPTH_ZERO); - cur = end = moves; endBadCaptures = moves + MAX_MOVES - 1; countermoves = cm; followupmoves = fm; ss = s; - if (p.checkers()) + if (pos.checkers()) stage = EVASION; else stage = MAIN_SEARCH; ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); - end += (ttMove != MOVE_NONE); + endMoves += (ttMove != MOVE_NONE); } -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, - Square sq) : pos(p), history(h), cur(moves), end(moves) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh, + Square s) : pos(p), history(h), counterMovesHistory(cmh) { assert(d <= DEPTH_ZERO); - if (p.checkers()) + if (pos.checkers()) stage = EVASION; else if (d > DEPTH_QS_NO_CHECKS) stage = QSEARCH_0; else if (d > DEPTH_QS_RECAPTURES) - { stage = QSEARCH_1; - // Skip TT move if is not a capture or a promotion. This avoids qsearch - // tree explosion due to a possible perpetual check or similar rare cases - // when TT table is full. - if (ttm && !pos.capture_or_promotion(ttm)) - ttm = MOVE_NONE; - } else { stage = RECAPTURE; - recaptureSquare = sq; + recaptureSquare = s; ttm = MOVE_NONE; } ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); - end += (ttMove != MOVE_NONE); + endMoves += (ttMove != MOVE_NONE); } -MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt) - : pos(p), history(h), cur(moves), end(moves) { +MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, const CounterMovesHistoryStats& cmh, PieceType pt) + : pos(p), history(h), counterMovesHistory(cmh) { assert(!pos.checkers()); - stage = MULTICUT; + stage = PROBCUT; - // In MultiCut we generate only captures that are better than the parent's + // In ProbCut we generate only captures that are better than the parent's // captured piece. captureThreshold = PieceValue[MG][pt]; ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); @@ -138,12 +127,12 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold)) ttMove = MOVE_NONE; - end += (ttMove != MOVE_NONE); + endMoves += (ttMove != MOVE_NONE); } -/// score() assign a numerical move ordering score to each move in a move list. -/// The moves with highest scores will be picked first. +/// score() assign a numerical value to each move in a move list. The moves with +/// highest values will be picked first. template<> void MovePicker::score() { // Winning and equal captures in the main search are ordered by MVV/LVA. @@ -159,54 +148,45 @@ void MovePicker::score() { // badCaptures[] array, but instead of doing it now we delay until the move // has been picked up in pick_move_from_list(). This way we save some SEE // calls in case we get a cutoff. - Move m; + for (auto& m : *this) + if (type_of(m) == ENPASSANT) + m.value = PieceValue[MG][PAWN] - Value(PAWN); - for (ExtMove* it = moves; it != end; ++it) - { - m = it->move; - it->score = PieceValue[MG][pos.piece_on(to_sq(m))] - - type_of(pos.moved_piece(m)); - - if (type_of(m) == PROMOTION) - it->score += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; - - else if (type_of(m) == ENPASSANT) - it->score += PieceValue[MG][PAWN]; - } + else if (type_of(m) == PROMOTION) + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - Value(PAWN) + + PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; + else + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))); } template<> void MovePicker::score() { - Move m; + Square prevSq = to_sq((ss-1)->currentMove); + const HistoryStats& cmh = counterMovesHistory[pos.piece_on(prevSq)][prevSq]; - for (ExtMove* it = moves; it != end; ++it) - { - m = it->move; - it->score = history[pos.moved_piece(m)][to_sq(m)]; - } + for (auto& m : *this) + m.value = history[pos.moved_piece(m)][to_sq(m)] + + cmh[pos.moved_piece(m)][to_sq(m)]; } template<> void MovePicker::score() { // Try good captures ordered by MVV/LVA, then non-captures if destination square // is not under attack, ordered by history value, then bad-captures and quiet - // moves with a negative SEE. This last group is ordered by the SEE score. - Move m; - int seeScore; + // moves with a negative SEE. This last group is ordered by the SEE value. + Value see; - for (ExtMove* it = moves; it != end; ++it) - { - m = it->move; - if ((seeScore = pos.see_sign(m)) < 0) - it->score = seeScore - HistoryStats::Max; // At the bottom + 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)) - it->score = PieceValue[MG][pos.piece_on(to_sq(m))] - - type_of(pos.moved_piece(m)) + HistoryStats::Max; + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max; else - it->score = history[pos.moved_piece(m)][to_sq(m)]; - } + m.value = history[pos.moved_piece(m)][to_sq(m)]; } @@ -220,72 +200,73 @@ void MovePicker::generate_next_stage() { switch (++stage) { case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6: - end = generate(pos, moves); + endMoves = generate(pos, moves); score(); - return; + break; case KILLERS_S1: cur = killers; - end = cur + 2; + endMoves = cur + 2; - killers[0].move = ss->killers[0]; - killers[1].move = ss->killers[1]; + killers[0] = ss->killers[0]; + killers[1] = ss->killers[1]; killers[2].move = killers[3].move = MOVE_NONE; killers[4].move = killers[5].move = MOVE_NONE; - // Please note that following code is racy and could yield to rare (less - // than 1 out of a million) duplicated entries in SMP case. This is harmless. + // In SMP case countermoves[] and followupmoves[] could have duplicated entries + // in rare cases (less than 1 out of a million). This is harmless. - // Be sure countermoves are different from killers + // Be sure countermoves and followupmoves are different from killers for (int i = 0; i < 2; ++i) - if ( countermoves[i] != (cur+0)->move - && countermoves[i] != (cur+1)->move) - (end++)->move = countermoves[i]; + if ( countermoves[i] != killers[0] + && countermoves[i] != killers[1]) + *endMoves++ = countermoves[i]; - // Be sure followupmoves are different from killers and countermoves for (int i = 0; i < 2; ++i) - if ( followupmoves[i] != (cur+0)->move - && followupmoves[i] != (cur+1)->move - && followupmoves[i] != (cur+2)->move - && followupmoves[i] != (cur+3)->move) - (end++)->move = followupmoves[i]; - return; + if ( followupmoves[i] != killers[0] + && followupmoves[i] != killers[1] + && followupmoves[i] != killers[2] + && followupmoves[i] != killers[3]) + *endMoves++ = followupmoves[i]; + break; case QUIETS_1_S1: - endQuiets = end = generate(pos, moves); + endQuiets = endMoves = generate(pos, moves); score(); - end = std::partition(cur, end, has_positive_score); - insertion_sort(cur, end); - return; + endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; }); + insertion_sort(cur, endMoves); + break; case QUIETS_2_S1: - cur = end; - end = endQuiets; + cur = endMoves; + endMoves = endQuiets; if (depth >= 3 * ONE_PLY) - insertion_sort(cur, end); - return; + insertion_sort(cur, endMoves); + break; case BAD_CAPTURES_S1: // Just pick them in reverse order to get MVV/LVA ordering cur = moves + MAX_MOVES - 1; - end = endBadCaptures; - return; + endMoves = endBadCaptures; + break; case EVASIONS_S2: - end = generate(pos, moves); - if (end > moves + 1) + endMoves = generate(pos, moves); + if (endMoves - moves > 1) score(); - return; + break; case QUIET_CHECKS_S3: - end = generate(pos, moves); - return; + endMoves = generate(pos, moves); + break; - case EVASION: case QSEARCH_0: case QSEARCH_1: case MULTICUT: case RECAPTURE: + case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: stage = STOP; + /* Fall through */ + case STOP: - end = cur + 1; // Avoid another next_phase() call - return; + endMoves = cur + 1; // Avoid another generate_next_stage() call + break; default: assert(false); @@ -295,7 +276,7 @@ void MovePicker::generate_next_stage() { /// 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 +/// left. It picks the move with the biggest value from a list of generated moves /// taking care not to return the ttMove if it has already been searched. template<> Move MovePicker::next_move() { @@ -304,71 +285,71 @@ Move MovePicker::next_move() { while (true) { - while (cur == end) + while (cur == endMoves) generate_next_stage(); switch (stage) { - case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case MULTICUT: + case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: ++cur; return ttMove; case CAPTURES_S1: - move = pick_best(cur++, end)->move; + move = pick_best(cur++, endMoves); if (move != ttMove) { - if (pos.see_sign(move) >= 0) + if (pos.see_sign(move) >= VALUE_ZERO) return move; // Losing capture, move it to the tail of the array - (endBadCaptures--)->move = move; + *endBadCaptures-- = move; } break; case KILLERS_S1: - move = (cur++)->move; + move = *cur++; if ( move != MOVE_NONE - && pos.pseudo_legal(move) && move != ttMove + && pos.pseudo_legal(move) && !pos.capture(move)) return move; break; case QUIETS_1_S1: case QUIETS_2_S1: - move = (cur++)->move; + move = *cur++; if ( move != ttMove - && move != killers[0].move - && move != killers[1].move - && move != killers[2].move - && move != killers[3].move - && move != killers[4].move - && move != killers[5].move) + && move != killers[0] + && move != killers[1] + && move != killers[2] + && move != killers[3] + && move != killers[4] + && move != killers[5]) return move; break; case BAD_CAPTURES_S1: - return (cur--)->move; + return *cur--; case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4: - move = pick_best(cur++, end)->move; + move = pick_best(cur++, endMoves); if (move != ttMove) return move; break; case CAPTURES_S5: - move = pick_best(cur++, end)->move; + move = pick_best(cur++, endMoves); if (move != ttMove && pos.see(move) > captureThreshold) return move; break; case CAPTURES_S6: - move = pick_best(cur++, end)->move; + move = pick_best(cur++, endMoves); if (to_sq(move) == recaptureSquare) return move; break; case QUIET_CHECKS_S3: - move = (cur++)->move; + move = *cur++; if (move != ttMove) return move; break;