X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=84f26dbf7835c08a2794313aad91560d4e6f3991;hp=09f7611c527b8e397f6422c2901f7a48854726cd;hb=8a7876d48d4360d14d918c1ff444b5d6eb0382de;hpb=62c0dc5dea4b3398afbf2bc015e91fdaedfdb81e diff --git a/src/movepick.cpp b/src/movepick.cpp index 09f7611c..84f26dbf 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -49,9 +49,9 @@ namespace { } } - // Unary predicate used by std::partition to split positive scores from remaining + // Unary predicate used by std::partition to split positive values 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; } + inline bool has_positive_value(const ExtMove& ms) { return ms.value > 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 @@ -61,7 +61,7 @@ namespace { std::swap(*begin, *std::max_element(begin, end)); return begin; } -} +} // namespace /// Constructors of the MovePicker class. As arguments we pass information @@ -81,7 +81,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& followupmoves = fm; ss = s; - if (p.checkers()) + if (pos.checkers()) stage = EVASION; else @@ -92,11 +92,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& } MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, - Square sq) : pos(p), history(h), cur(moves), end(moves) { + Square s) : pos(p), history(h), cur(moves), end(moves) { assert(d <= DEPTH_ZERO); - if (p.checkers()) + if (pos.checkers()) stage = EVASION; else if (d > DEPTH_QS_NO_CHECKS) @@ -115,7 +115,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& else { stage = RECAPTURE; - recaptureSquare = sq; + recaptureSquare = s; ttm = MOVE_NONE; } @@ -142,8 +142,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece } -/// 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. @@ -164,14 +164,14 @@ void MovePicker::score() { 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)); + it->value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))); - if (type_of(m) == PROMOTION) - it->score += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; + if (type_of(m) == ENPASSANT) + it->value += PieceValue[MG][PAWN]; - else if (type_of(m) == ENPASSANT) - it->score += PieceValue[MG][PAWN]; + else if (type_of(m) == PROMOTION) + it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; } } @@ -183,7 +183,7 @@ void MovePicker::score() { for (ExtMove* it = moves; it != end; ++it) { m = it->move; - it->score = history[pos.moved_piece(m)][to_sq(m)]; + it->value = history[pos.moved_piece(m)][to_sq(m)]; } } @@ -191,21 +191,21 @@ 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. + // moves with a negative SEE. This last group is ordered by the SEE value. Move m; - int seeScore; + 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 + if ((see = pos.see_sign(m)) < VALUE_ZERO) + it->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; + it->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)]; + it->value = history[pos.moved_piece(m)][to_sq(m)]; } } @@ -254,7 +254,7 @@ void MovePicker::generate_next_stage() { case QUIETS_1_S1: endQuiets = end = generate(pos, moves); score(); - end = std::partition(cur, end, has_positive_score); + end = std::partition(cur, end, has_positive_value); insertion_sort(cur, end); return; @@ -283,6 +283,8 @@ void MovePicker::generate_next_stage() { 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; @@ -295,7 +297,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() { @@ -317,7 +319,7 @@ Move MovePicker::next_move() { move = pick_best(cur++, end)->move; 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 @@ -328,8 +330,8 @@ Move MovePicker::next_move() { case KILLERS_S1: move = (cur++)->move; if ( move != MOVE_NONE - && pos.pseudo_legal(move) && move != ttMove + && pos.pseudo_legal(move) && !pos.capture(move)) return move; break;