X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=74da3205b3f5265e790b13abe1fabe568ffcbec9;hp=3b6ecbbfb05de5499d4972db052ade34536ac58b;hb=414a3e6ee3ab38215f9eba69939773ba62a9766e;hpb=f731bcadb7908f03c42e3d63fefe82552f09c926 diff --git a/src/movepick.cpp b/src/movepick.cpp index 3b6ecbbf..74da3205 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -28,9 +28,7 @@ namespace { MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES, EVASION, EVASIONS_INIT, ALL_EVASIONS, PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES, - QSEARCH_WITH_CHECKS, QCAPTURES_1_INIT, QCAPTURES_1, QCHECKS, - QSEARCH_NO_CHECKS, QCAPTURES_2_INIT, QCAPTURES_2, - QSEARCH_RECAPTURES, QRECAPTURES + QSEARCH, QCAPTURES_INIT, QCAPTURES, QCHECKS, QSEARCH_RECAPTURES, QRECAPTURES }; // partial_insertion_sort() sorts moves in descending order up to and including @@ -66,9 +64,10 @@ namespace { /// search captures, promotions, and some checks) and how important good move /// ordering is at the current node. +/// MovePicker constructor for the main search MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, - const PieceToHistory** ch, Move cm, Move* killers_p) - : pos(p), mainHistory(mh), contHistory(ch), countermove(cm), + const CapturePieceToHistory* cph, const PieceToHistory** ch, Move cm, Move* killers_p) + : pos(p), mainHistory(mh), captureHistory(cph), contHistory(ch), countermove(cm), killers{killers_p[0], killers_p[1]}, depth(d){ assert(d > DEPTH_ZERO); @@ -78,20 +77,17 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHist stage += (ttMove == MOVE_NONE); } -MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, - const PieceToHistory** ch, Square s) - : pos(p), mainHistory(mh), contHistory(ch) { +/// MovePicker constructor for quiescence search +MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHistory* mh, const CapturePieceToHistory* cph, Square s) + : pos(p), mainHistory(mh), captureHistory(cph), depth(d) { assert(d <= DEPTH_ZERO); if (pos.checkers()) stage = EVASION; - else if (d > DEPTH_QS_NO_CHECKS) - stage = QSEARCH_WITH_CHECKS; - else if (d > DEPTH_QS_RECAPTURES) - stage = QSEARCH_NO_CHECKS; + stage = QSEARCH; else { @@ -104,14 +100,14 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const ButterflyHist stage += (ttMove == MOVE_NONE); } -MovePicker::MovePicker(const Position& p, Move ttm, Value th) - : pos(p), threshold(th) { +/// MovePicker constructor for ProbCut: we generate captures with SEE higher +/// than or equal to the given threshold. +MovePicker::MovePicker(const Position& p, Move ttm, Value th, const CapturePieceToHistory* cph) + : pos(p), captureHistory(cph), threshold(th) { assert(!pos.checkers()); stage = PROBCUT; - - // In ProbCut we generate captures with SEE higher than or equal to the given threshold ttMove = ttm && pos.pseudo_legal(ttm) && pos.capture(ttm) @@ -122,23 +118,31 @@ MovePicker::MovePicker(const Position& p, Move ttm, Value th) /// score() assigns a numerical value to each move in a list, used for sorting. /// Captures are ordered by Most Valuable Victim (MVV), preferring captures -/// near our home rank. Quiets are ordered using the histories. -template +/// with a good history. Quiets are ordered using the histories. +template void MovePicker::score() { + static_assert(Type == CAPTURES || Type == QUIETS || Type == EVASIONS, "Wrong type"); + for (auto& m : *this) - if (T == CAPTURES || (T == EVASIONS && pos.capture(m))) - m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - - (T == EVASIONS ? Value(type_of(pos.moved_piece(m))) - : Value(200 * relative_rank(pos.side_to_move(), to_sq(m)))); - else if (T == QUIETS) + if (Type == CAPTURES) + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] + + Value((*captureHistory)[pos.moved_piece(m)][to_sq(m)][type_of(pos.piece_on(to_sq(m)))]); + + else if (Type == QUIETS) m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] + (*contHistory[0])[pos.moved_piece(m)][to_sq(m)] + (*contHistory[1])[pos.moved_piece(m)][to_sq(m)] + (*contHistory[3])[pos.moved_piece(m)][to_sq(m)]; - else // Quiet evasions - m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] - (1 << 28); + else // Type == EVASIONS + { + if (pos.capture(m)) + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))); + else + m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] - (1 << 28); + } } /// next_move() is the most important method of the MovePicker class. It returns @@ -152,8 +156,7 @@ Move MovePicker::next_move(bool skipQuiets) { switch (stage) { - case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS: - case QSEARCH_NO_CHECKS: case PROBCUT: + case MAIN_SEARCH: case EVASION: case QSEARCH: case PROBCUT: ++stage; return ttMove; @@ -170,7 +173,7 @@ Move MovePicker::next_move(bool skipQuiets) { move = pick_best(cur++, endMoves); if (move != ttMove) { - if (pos.see_ge(move)) + if (pos.see_ge(move, Value(-55 * (cur-1)->value / 1024))) return move; // Losing capture, move it to the beginning of the array @@ -271,21 +274,21 @@ Move MovePicker::next_move(bool skipQuiets) { } break; - case QCAPTURES_1_INIT: case QCAPTURES_2_INIT: + case QCAPTURES_INIT: cur = moves; endMoves = generate(pos, cur); score(); ++stage; /* fallthrough */ - case QCAPTURES_1: case QCAPTURES_2: + case QCAPTURES: while (cur < endMoves) { move = pick_best(cur++, endMoves); if (move != ttMove) return move; } - if (stage == QCAPTURES_2) + if (depth <= DEPTH_QS_NO_CHECKS) break; cur = moves; endMoves = generate(pos, cur); @@ -304,14 +307,13 @@ Move MovePicker::next_move(bool skipQuiets) { case QSEARCH_RECAPTURES: cur = moves; endMoves = generate(pos, cur); - score(); ++stage; /* fallthrough */ case QRECAPTURES: while (cur < endMoves) { - move = pick_best(cur++, endMoves); + move = *cur++; if (to_sq(move) == recaptureSquare) return move; }