X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=e2ae7d9591712dd5eabec2d767b72311843e0fd3;hp=c4eaa902e292e64cdea5858f4f9ae3318f07ec92;hb=69a14554eebc1467db7234e354bfd864fa46b1b9;hpb=917944e9c5324cc9659e630570e1852270b22bd4 diff --git a/src/movepick.cpp b/src/movepick.cpp index c4eaa902..e2ae7d95 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -35,7 +35,7 @@ namespace { STOP }; - // Our insertion sort, guaranteed to be stable, as is needed + // Our insertion sort, which is guaranteed (and also needed) to be stable void insertion_sort(ExtMove* begin, ExtMove* end) { ExtMove tmp, *p, *q; @@ -53,9 +53,9 @@ namespace { // ones so to sort separately the two sets, and with the second sort delayed. inline bool has_positive_score(const ExtMove& ms) { return ms.score > 0; } - // Picks and moves to the front the best move in the range [begin, end), - // it is faster than sorting all the moves in advance when moves are few, as - // normally are the possible captures. + // 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) { std::swap(*begin, *std::max_element(begin, end)); @@ -105,7 +105,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& { stage = QSEARCH_1; - // Skip TT move if is not a capture or a promotion, this avoids qsearch + // 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)) @@ -129,7 +129,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece stage = PROBCUT; - // In ProbCut we generate only captures better than parent's captured piece + // 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); @@ -140,15 +141,6 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece } -/// quiet_moves() returns a pointer to the beginning of moves array. It -/// is used to access already tried quiet moves when updating history. - -const ExtMove* MovePicker::quiet_moves() const { - return stage == KILLERS_S1 ? killers - : stage == QUIETS_1_S1 || stage == QUIETS_2_S1 ? moves : NULL; -} - - /// score() assign a numerical move ordering score to each move in a move list. /// The moves with highest scores will be picked first. template<> @@ -162,10 +154,10 @@ void MovePicker::score() { // where it is possible to recapture with the hanging piece). Exchanging // big pieces before capturing a hanging piece probably helps to reduce // the subtree size. - // In main search we want to push captures with negative SEE values to - // badCaptures[] array, but instead of doing it now we delay till when - // the move has been picked up in pick_move_from_list(), this way we save - // some SEE calls in case we get a cutoff (idea from Pablo Vazquez). + // In main search we want to push captures with negative SEE values to the + // 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 (ExtMove* it = moves; it != end; ++it) @@ -292,7 +284,7 @@ void MovePicker::generate_next() { /// next_move() is the most important method of the MovePicker class. It returns -/// a new pseudo legal move every time is called, until there are no more moves +/// 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 /// taking care not returning the ttMove if has already been searched previously. template<>