X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=55c685476dcdd481c898b32104a76e0f8c29044b;hp=cc79528027b25334be0316e2499137cd29c3c3e6;hb=ecd3218b6b24bb54509dbe6e9b24517b7df7390d;hpb=6b9a22b40d37d27ad10cafd8697d96e90a586f8a diff --git a/src/movepick.cpp b/src/movepick.cpp index cc795280..55c68547 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -34,30 +34,28 @@ namespace { QSEARCH_RECAPTURES, QRECAPTURES }; - // An insertion sort, which sorts moves in descending order up to and including a given limit. - // The order of moves smaller than the limit is left unspecified. - // To keep the implementation simple, *begin is always included in the list of sorted moves. - void partial_insertion_sort(ExtMove* begin, ExtMove* end, int limit) - { - for (ExtMove *sortedEnd = begin + 1, *p = begin + 1; p < end; ++p) + // partial_insertion_sort() sorts moves in descending order up to and including + // a given limit. The order of moves smaller than the limit is left unspecified. + void partial_insertion_sort(ExtMove* begin, ExtMove* end, int limit) { + + for (ExtMove *sortedEnd = begin, *p = begin + 1; p < end; ++p) if (p->value >= limit) { ExtMove tmp = *p, *q; - *p = *sortedEnd; - for (q = sortedEnd; q != begin && *(q-1) < tmp; --q) - *q = *(q-1); + *p = *++sortedEnd; + for (q = sortedEnd; q != begin && *(q - 1) < tmp; --q) + *q = *(q - 1); *q = tmp; - ++sortedEnd; } } // 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. - Move pick_best(ExtMove* begin, ExtMove* end) - { - std::swap(*begin, *std::max_element(begin, end)); - return *begin; + Move pick_best(ExtMove* begin, ExtMove* end) { + + std::swap(*begin, *std::max_element(begin, end)); + return *begin; } } // namespace @@ -76,6 +74,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s) Square prevSq = to_sq((ss-1)->currentMove); countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq]; + killers[0] = ss->killers[0]; + killers[1] = ss->killers[1]; stage = pos.checkers() ? EVASION : MAIN_SEARCH; ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE; @@ -118,7 +118,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th) ttMove = ttm && pos.pseudo_legal(ttm) && pos.capture(ttm) - && pos.see_ge(ttm, threshold)? ttm : MOVE_NONE; + && pos.see_ge(ttm, threshold) ? ttm : MOVE_NONE; stage += (ttMove == MOVE_NONE); } @@ -143,11 +143,11 @@ void MovePicker::score() { template<> void MovePicker::score() { - const HistoryStats& history = pos.this_thread()->history; + const ButterflyHistory& history = pos.this_thread()->history; - const CounterMoveStats& cmh = *(ss-1)->counterMoves; - const CounterMoveStats& fmh = *(ss-2)->counterMoves; - const CounterMoveStats& fm2 = *(ss-4)->counterMoves; + const PieceToHistory& cmh = *(ss-1)->history; + const PieceToHistory& fmh = *(ss-2)->history; + const PieceToHistory& fm2 = *(ss-4)->history; Color c = pos.side_to_move(); @@ -155,21 +155,21 @@ void MovePicker::score() { m.value = cmh[pos.moved_piece(m)][to_sq(m)] + fmh[pos.moved_piece(m)][to_sq(m)] + fm2[pos.moved_piece(m)][to_sq(m)] - + history.get(c, m); + + history[c][from_to(m)]; } template<> void MovePicker::score() { // Try captures ordered by MVV/LVA, then non-captures ordered by stats heuristics - const HistoryStats& history = pos.this_thread()->history; + const ButterflyHistory& history = pos.this_thread()->history; Color c = pos.side_to_move(); for (auto& m : *this) if (pos.capture(m)) m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max; + - Value(type_of(pos.moved_piece(m))) + (1 << 28); else - m.value = history.get(c, m); + m.value = history[c][from_to(m)]; } @@ -194,6 +194,7 @@ Move MovePicker::next_move(bool skipQuiets) { endMoves = generate(pos, cur); score(); ++stage; + /* fallthrough */ case GOOD_CAPTURES: while (cur < endMoves) @@ -201,7 +202,7 @@ Move MovePicker::next_move(bool skipQuiets) { move = pick_best(cur++, endMoves); if (move != ttMove) { - if (pos.see_ge(move, VALUE_ZERO)) + if (pos.see_ge(move)) return move; // Losing capture, move it to the beginning of the array @@ -210,40 +211,43 @@ Move MovePicker::next_move(bool skipQuiets) { } ++stage; - move = ss->killers[0]; // First killer move + move = killers[0]; // First killer move if ( move != MOVE_NONE && move != ttMove && pos.pseudo_legal(move) && !pos.capture(move)) return move; + /* fallthrough */ case KILLERS: ++stage; - move = ss->killers[1]; // Second killer move + move = killers[1]; // Second killer move if ( move != MOVE_NONE && move != ttMove && pos.pseudo_legal(move) && !pos.capture(move)) return move; + /* fallthrough */ case COUNTERMOVE: ++stage; move = countermove; if ( move != MOVE_NONE && move != ttMove - && move != ss->killers[0] - && move != ss->killers[1] + && move != killers[0] + && move != killers[1] && pos.pseudo_legal(move) && !pos.capture(move)) return move; + /* fallthrough */ case QUIET_INIT: cur = endBadCaptures; endMoves = generate(pos, cur); score(); - partial_insertion_sort(cur, endMoves, -4000 * depth / ONE_PLY); ++stage; + /* fallthrough */ case QUIET: while ( cur < endMoves @@ -252,13 +256,14 @@ Move MovePicker::next_move(bool skipQuiets) { move = *cur++; if ( move != ttMove - && move != ss->killers[0] - && move != ss->killers[1] + && move != killers[0] + && move != killers[1] && move != countermove) return move; } ++stage; cur = moves; // Point to beginning of bad captures + /* fallthrough */ case BAD_CAPTURES: if (cur < endBadCaptures) @@ -270,6 +275,7 @@ Move MovePicker::next_move(bool skipQuiets) { endMoves = generate(pos, cur); score(); ++stage; + /* fallthrough */ case ALL_EVASIONS: while (cur < endMoves) @@ -285,6 +291,7 @@ Move MovePicker::next_move(bool skipQuiets) { endMoves = generate(pos, cur); score(); ++stage; + /* fallthrough */ case PROBCUT_CAPTURES: while (cur < endMoves) @@ -301,6 +308,7 @@ Move MovePicker::next_move(bool skipQuiets) { endMoves = generate(pos, cur); score(); ++stage; + /* fallthrough */ case QCAPTURES_1: case QCAPTURES_2: while (cur < endMoves) @@ -314,6 +322,7 @@ Move MovePicker::next_move(bool skipQuiets) { cur = moves; endMoves = generate(pos, cur); ++stage; + /* fallthrough */ case QCHECKS: while (cur < endMoves) @@ -329,6 +338,7 @@ Move MovePicker::next_move(bool skipQuiets) { endMoves = generate(pos, cur); score(); ++stage; + /* fallthrough */ case QRECAPTURES: while (cur < endMoves)