X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=7fe8971b349ce7efeb41e021b93665571a482a7c;hb=b48439e90643cb6f65f9e34d1421976883c12efc;hp=8a4a8b8f75642b7997f4574b6485f8877a54d721;hpb=2d96e8fbe9b683ff320a197715155381139c7664;p=stockfish diff --git a/src/movepick.cpp b/src/movepick.cpp index 8a4a8b8f..7fe8971b 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -34,11 +34,11 @@ 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, Value limit) - { + // 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. + // To keep the implementation simple, *begin is always included in the sorted moves. + void partial_insertion_sort(ExtMove* begin, ExtMove* end, int limit) { + for (ExtMove *sortedEnd = begin + 1, *p = begin + 1; p < end; ++p) if (p->value >= limit) { @@ -54,10 +54,10 @@ namespace { // 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 @@ -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); } @@ -241,9 +241,7 @@ Move MovePicker::next_move(bool skipQuiets) { cur = endBadCaptures; endMoves = generate(pos, cur); score(); - - partial_insertion_sort(cur, endMoves, - depth < 3 * ONE_PLY ? VALUE_ZERO : Value(INT_MIN)); + partial_insertion_sort(cur, endMoves, -4000 * depth / ONE_PLY); ++stage; case QUIET: