X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=4f2fa01eb231ba64e10feaba33d1af33977a35be;hp=5c8338c0c19ab96d08f55879015d8f422002985c;hb=45b0aea875860e9f0fe2d0435ee6163906639194;hpb=733d0099b2a3e3ad594bb551d37c8a06c62f13db diff --git a/src/movepick.cpp b/src/movepick.cpp index 5c8338c0..4f2fa01e 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 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 @@ -25,7 +25,7 @@ namespace { - enum Sequencer { + enum Stages { MAIN_SEARCH, CAPTURES_S1, KILLERS_S1, QUIETS_1_S1, QUIETS_2_S1, BAD_CAPTURES_S1, EVASION, EVASIONS_S2, QSEARCH_0, CAPTURES_S3, QUIET_CHECKS_S3, @@ -36,9 +36,9 @@ namespace { }; // Our insertion sort, guaranteed to be stable, as is needed - void insertion_sort(MoveStack* begin, MoveStack* end) + void insertion_sort(ExtMove* begin, ExtMove* end) { - MoveStack tmp, *p, *q; + ExtMove tmp, *p, *q; for (p = begin + 1; p < end; ++p) { @@ -51,12 +51,12 @@ namespace { // Unary predicate used by std::partition to split positive scores from remaining // ones so to sort separately the two sets, and with the second sort delayed. - inline bool has_positive_score(const MoveStack& ms) { return ms.score > 0; } + 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. - inline MoveStack* pick_best(MoveStack* begin, MoveStack* end) + inline ExtMove* pick_best(ExtMove* begin, ExtMove* end) { std::swap(*begin, *std::max_element(begin, end)); return begin; @@ -70,53 +70,40 @@ namespace { /// search captures, promotions and some checks) and about how important good /// move ordering is at the current node. -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, - Search::Stack* s, Value beta) : pos(p), Hist(h), depth(d) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, + Move* cm, Search::Stack* s) : pos(p), history(h), depth(d) { assert(d > DEPTH_ZERO); - captureThreshold = 0; cur = end = moves; endBadCaptures = moves + MAX_MOVES - 1; + countermoves = cm; ss = s; if (p.checkers()) - phase = EVASION; + stage = EVASION; else - { - phase = MAIN_SEARCH; - - killers[0].move = ss->killers[0]; - killers[1].move = ss->killers[1]; - - // Consider sligtly negative captures as good if at low depth and far from beta - if (ss && ss->staticEval < beta - PawnValueMg && d < 3 * ONE_PLY) - captureThreshold = -PawnValueMg; - - // Consider negative captures as good if still enough to reach beta - else if (ss && ss->staticEval > beta) - captureThreshold = beta - ss->staticEval; - } + stage = MAIN_SEARCH; ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE); end += (ttMove != MOVE_NONE); } -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, - Square sq) : pos(p), Hist(h), cur(moves), end(moves) { +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, + Square sq) : pos(p), history(h), cur(moves), end(moves) { assert(d <= DEPTH_ZERO); if (p.checkers()) - phase = EVASION; + stage = EVASION; else if (d > DEPTH_QS_NO_CHECKS) - phase = QSEARCH_0; + stage = QSEARCH_0; else if (d > DEPTH_QS_RECAPTURES) { - phase = QSEARCH_1; + 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 @@ -126,7 +113,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, } else { - phase = RECAPTURE; + stage = RECAPTURE; recaptureSquare = sq; ttm = MOVE_NONE; } @@ -135,12 +122,12 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, end += (ttMove != MOVE_NONE); } -MovePicker::MovePicker(const Position& p, Move ttm, const History& h, PieceType pt) - : pos(p), Hist(h), cur(moves), end(moves) { +MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt) + : pos(p), history(h), cur(moves), end(moves) { assert(!pos.checkers()); - phase = PROBCUT; + stage = PROBCUT; // In ProbCut we generate only captures better than parent's captured piece captureThreshold = PieceValue[MG][pt]; @@ -172,7 +159,7 @@ void MovePicker::score() { // some SEE calls in case we get a cutoff (idea from Pablo Vazquez). Move m; - for (MoveStack* it = moves; it != end; ++it) + for (ExtMove* it = moves; it != end; ++it) { m = it->move; it->score = PieceValue[MG][pos.piece_on(to_sq(m))] @@ -191,10 +178,10 @@ void MovePicker::score() { Move m; - for (MoveStack* it = moves; it != end; ++it) + for (ExtMove* it = moves; it != end; ++it) { m = it->move; - it->score = Hist[pos.piece_moved(m)][to_sq(m)]; + it->score = history[pos.piece_moved(m)][to_sq(m)]; } } @@ -206,17 +193,17 @@ void MovePicker::score() { Move m; int seeScore; - for (MoveStack* it = moves; it != end; ++it) + for (ExtMove* it = moves; it != end; ++it) { m = it->move; if ((seeScore = pos.see_sign(m)) < 0) - it->score = seeScore - History::Max; // At the bottom + it->score = seeScore - HistoryStats::Max; // At the bottom else if (pos.is_capture(m)) it->score = PieceValue[MG][pos.piece_on(to_sq(m))] - - type_of(pos.piece_moved(m)) + History::Max; + - type_of(pos.piece_moved(m)) + HistoryStats::Max; else - it->score = Hist[pos.piece_moved(m)][to_sq(m)]; + it->score = history[pos.piece_moved(m)][to_sq(m)]; } } @@ -228,7 +215,7 @@ void MovePicker::generate_next() { cur = moves; - switch (++phase) { + switch (++stage) { case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6: end = generate(pos, moves); @@ -238,6 +225,19 @@ void MovePicker::generate_next() { case KILLERS_S1: cur = killers; end = cur + 2; + + killers[0].move = ss->killers[0]; + killers[1].move = ss->killers[1]; + killers[2].move = killers[3].move = MOVE_NONE; + + // Be sure countermoves are different from killers + for (int i = 0; i < 2; i++) + if (countermoves[i] != cur->move && countermoves[i] != (cur+1)->move) + (end++)->move = countermoves[i]; + + if (countermoves[1] && countermoves[1] == countermoves[0]) // Due to SMP races + killers[3].move = MOVE_NONE; + return; case QUIETS_1_S1: @@ -271,7 +271,7 @@ void MovePicker::generate_next() { return; case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: - phase = STOP; + stage = STOP; case STOP: end = cur + 1; // Avoid another next_phase() call return; @@ -296,7 +296,7 @@ Move MovePicker::next_move() { while (cur == end) generate_next(); - switch (phase) { + switch (stage) { case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: cur++; @@ -306,9 +306,7 @@ Move MovePicker::next_move() { move = pick_best(cur++, end)->move; if (move != ttMove) { - assert(captureThreshold <= 0); // Otherwise we cannot use see_sign() - - if (pos.see_sign(move) >= captureThreshold) + if (pos.see_sign(move) >= 0) return move; // Losing capture, move it to the tail of the array @@ -329,7 +327,9 @@ Move MovePicker::next_move() { move = (cur++)->move; if ( move != ttMove && move != killers[0].move - && move != killers[1].move) + && move != killers[1].move + && move != killers[2].move + && move != killers[3].move) return move; break; @@ -374,4 +374,4 @@ Move MovePicker::next_move() { /// from the split point's shared MovePicker object. This function is not thread /// safe so must be lock protected by the caller. template<> -Move MovePicker::next_move() { return ss->sp->movePicker->next_move(); } +Move MovePicker::next_move() { return ss->splitPoint->movePicker->next_move(); }