X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=b96b799542556a7f461e29d7b1472bf631689eab;hp=0dd44bbd8db54925e035728bea470075fe5004ae;hb=7a68916ff992115d8013e7ce31850aec558d8ac5;hpb=e2e249eabd2493e2bb9e5e017aafaac074a706ef diff --git a/src/movepick.cpp b/src/movepick.cpp index 0dd44bbd..b96b7995 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -23,7 +23,6 @@ //// Includes //// -#include #include #include "history.h" @@ -53,7 +52,7 @@ namespace { CACHE_LINE_ALIGNMENT const uint8_t MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP}; - const uint8_t EvasionsPhaseTable[] = { PH_EVASIONS, PH_STOP}; + const uint8_t EvasionsPhaseTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP}; const uint8_t QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP}; const uint8_t QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP}; } @@ -78,7 +77,9 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, finished = false; lastBadCapture = badCaptures; - if (ss) + pinned = p.pinned_pieces(pos.side_to_move()); + + if (ss && !p.is_check()) { ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller; searchTT |= ttMoves[1].move; @@ -87,21 +88,16 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, } else ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE; - Color us = pos.side_to_move(); - - dc = p.discovered_check_candidates(us); - pinned = p.pinned_pieces(us); - if (p.is_check()) phasePtr = EvasionsPhaseTable; else if (d > Depth(0)) - phasePtr = MainSearchPhaseTable + !searchTT; + phasePtr = MainSearchPhaseTable; else if (d == Depth(0)) - phasePtr = QsearchWithChecksPhaseTable + !searchTT; + phasePtr = QsearchWithChecksPhaseTable; else - phasePtr = QsearchWithoutChecksPhaseTable + !searchTT; + phasePtr = QsearchWithoutChecksPhaseTable; - phasePtr--; + phasePtr += !searchTT - 1; go_next_phase(); } @@ -123,7 +119,6 @@ void MovePicker::go_next_phase() { case PH_GOOD_CAPTURES: lastMove = generate_captures(pos, moves); score_captures(); - std::stable_sort(moves, lastMove); return; case PH_KILLERS: @@ -134,7 +129,7 @@ void MovePicker::go_next_phase() { case PH_NONCAPTURES: lastMove = generate_noncaptures(pos, moves); score_noncaptures(); - std::stable_sort(moves, lastMove); + sort_moves(moves, lastMove); return; case PH_BAD_CAPTURES: @@ -142,25 +137,22 @@ void MovePicker::go_next_phase() { // to get SEE move ordering. curMove = badCaptures; lastMove = lastBadCapture; - std::stable_sort(badCaptures, lastMove); return; case PH_EVASIONS: assert(pos.is_check()); - lastMove = generate_evasions(pos, moves, pinned); + lastMove = generate_evasions(pos, moves); score_evasions(); - std::stable_sort(moves, lastMove); return; case PH_QCAPTURES: lastMove = generate_captures(pos, moves); score_captures(); - std::stable_sort(moves, lastMove); return; case PH_QCHECKS: // Perhaps we should order moves move here? FIXME - lastMove = generate_non_capture_checks(pos, moves, dc); + lastMove = generate_non_capture_checks(pos, moves); return; case PH_STOP: @@ -202,8 +194,8 @@ void MovePicker::score_captures() { if (move_is_promotion(m)) cur->score = QueenValueMidgame; else - cur->score = int(pos.midgame_value_of_piece_on(move_to(m))) - -int(pos.type_of_piece_on(move_from(m))); + cur->score = pos.midgame_value_of_piece_on(move_to(m)) + - pos.type_of_piece_on(move_from(m)); } } @@ -234,19 +226,22 @@ void MovePicker::score_noncaptures() { } void MovePicker::score_evasions() { - + // Try good captures ordered by MVV/LVA, then non-captures if + // destination square is not under attack, ordered by history + // value, and at the end bad-captures and non-captures with a + // negative SEE. This last group is ordered by the SEE score. Move m; + int seeScore; for (MoveStack* cur = moves; cur != lastMove; cur++) { m = cur->move; - if (m == ttMoves[0].move) - cur->score = 2 * HistoryMax; - else if (!pos.square_is_empty(move_to(m))) - { - int seeScore = pos.see(m); - cur->score = seeScore + (seeScore >= 0 ? HistoryMax : 0); - } else + if ((seeScore = pos.see_sign(m)) < 0) + cur->score = seeScore; + else if (pos.move_is_capture(m)) + cur->score = pos.midgame_value_of_piece_on(move_to(m)) + - pos.type_of_piece_on(move_from(m)) + HistoryMax; + else cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m)); } } @@ -259,26 +254,23 @@ void MovePicker::score_evasions() { Move MovePicker::get_next_move() { - assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP); - assert( pos.is_check() || *phasePtr != PH_EVASIONS); - Move move; while (true) { while (curMove != lastMove) { - move = (curMove++)->move; - switch (phase) { case PH_TT_MOVES: + move = (curMove++)->move; if ( move != MOVE_NONE && move_is_legal(pos, move, pinned)) return move; break; case PH_GOOD_CAPTURES: + move = pick_best(curMove++, lastMove).move; if ( move != ttMoves[0].move && move != ttMoves[1].move && pos.pl_move_is_legal(move, pinned)) @@ -298,6 +290,7 @@ Move MovePicker::get_next_move() { break; case PH_KILLERS: + move = (curMove++)->move; if ( move != MOVE_NONE && move != ttMoves[0].move && move != ttMoves[1].move @@ -307,6 +300,7 @@ Move MovePicker::get_next_move() { break; case PH_NONCAPTURES: + move = (curMove++)->move; if ( move != ttMoves[0].move && move != ttMoves[1].move && move != killers[0].move @@ -315,13 +309,20 @@ Move MovePicker::get_next_move() { return move; break; - case PH_EVASIONS: case PH_BAD_CAPTURES: + move = pick_best(curMove++, lastMove).move; return move; + case PH_EVASIONS: case PH_QCAPTURES: + move = pick_best(curMove++, lastMove).move; + if ( move != ttMoves[0].move + && pos.pl_move_is_legal(move, pinned)) + return move; + break; + case PH_QCHECKS: - // Maybe postpone the legality check until after futility pruning? + move = (curMove++)->move; if ( move != ttMoves[0].move && pos.pl_move_is_legal(move, pinned)) return move;