X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=c71572e7cf86bead8aa853dd16db512ab329e55d;hp=8837bc469779c2892708d371dea20dfd679de469;hb=d087b0a34a6aaa0fc31d2fa256b02861d0351256;hpb=4f14bd50326d058fe14ae1dd51c57fac99b74153 diff --git a/src/movepick.cpp b/src/movepick.cpp index 8837bc46..c71572e7 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -8,6 +8,7 @@ the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -39,7 +40,7 @@ namespace { /// Variables - MovePicker::MovegenPhase PhaseTable[32]; + MovePicker::MovegenPhase PhaseTable[32]; int MainSearchPhaseIndex; int EvasionsPhaseIndex; int QsearchWithChecksPhaseIndex; @@ -62,7 +63,7 @@ namespace { /// move ordering is at the current node. MovePicker::MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, - Move k1, Move k2, Depth d) : pos(p) { + Move k1, Move k2, Depth d) : pos(p) { pvNode = pvnode; ttMove = ttm; mateKiller = (mk == ttm)? MOVE_NONE : mk; @@ -116,7 +117,7 @@ Move MovePicker::get_next_move() { if (ttMove != MOVE_NONE) { assert(move_is_ok(ttMove)); - if (generate_move_if_legal(pos, ttMove, pinned) != MOVE_NONE) + if (move_is_legal(pos, ttMove, pinned)) return ttMove; } break; @@ -125,7 +126,7 @@ Move MovePicker::get_next_move() { if (mateKiller != MOVE_NONE) { assert(move_is_ok(mateKiller)); - if (generate_move_if_legal(pos, mateKiller, pinned) != MOVE_NONE) + if (move_is_legal(pos, mateKiller, pinned)) return mateKiller; } break; @@ -147,13 +148,13 @@ Move MovePicker::get_next_move() { break; case PH_EVASIONS: - assert(pos.is_check()); + assert(pos.is_check()); numOfMoves = generate_evasions(pos, moves); score_evasions(); movesPicked = 0; break; - case PH_QCAPTURES: + case PH_QCAPTURES: numOfMoves = generate_captures(pos, moves); score_qcaptures(); movesPicked = 0; @@ -172,8 +173,6 @@ Move MovePicker::get_next_move() { return MOVE_NONE; } } - assert(false); - return MOVE_NONE; } @@ -192,7 +191,7 @@ Move MovePicker::get_next_move(Lock &lock) { if (m == MOVE_NONE) finished = true; - lock_release(&lock); + lock_release(&lock); return m; } @@ -207,37 +206,48 @@ void MovePicker::score_captures() { // Suprisingly, this appears to perform slightly better than SEE based // move ordering. The reason is probably that in a position with a winning // capture, capturing a more valuable (but sufficiently defended) piece - // first usually doesn't hurt. The opponent will have to recapture, and + // first usually doesn't hurt. The opponent will have to recapture, and // the hanging piece will still be hanging (except in the unusual cases - // where it is possible to recapture with the hanging piece). Exchanging + // 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. + // the subtree size. Instead of calculating SEE here to filter out + // loosing captures, we delay the filtering in pick_move_from_list() + Move m; + for (int i = 0; i < numOfMoves; i++) { - int seeValue = pos.see(moves[i].move); - if (seeValue >= 0) - { - if (move_promotion(moves[i].move)) - moves[i].score = QueenValueMidgame; - else - moves[i].score = int(pos.midgame_value_of_piece_on(move_to(moves[i].move))) - -int(pos.type_of_piece_on(move_from(moves[i].move))); - } else - moves[i].score = seeValue; + m = moves[i].move; + if (move_promotion(m)) + moves[i].score = QueenValueMidgame; + else + moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m))) + -int(pos.type_of_piece_on(move_from(m))); } } void MovePicker::score_noncaptures() { + // First score by history, when no history is available then use + // piece/square tables values. This seems to be better then a + // random choice when we don't have an history for any move. + Move m; + int hs; for (int i = 0; i < numOfMoves; i++) { - Move m = moves[i].move; + m = moves[i].move; + if (m == killer1) - moves[i].score = HistoryMax + 2; + hs = HistoryMax + 2; else if (m == killer2) - moves[i].score = HistoryMax + 1; + hs = HistoryMax + 1; else - moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m); + hs = H.move_ordering_score(pos.piece_on(move_from(m)), m); + + // Ensure moves in history are always sorted as first + if (hs > 0) + hs += 1000; + + moves[i].score = hs + pos.mg_pst_delta(m); } } @@ -268,25 +278,25 @@ void MovePicker::score_qcaptures() { moves[i].score = QueenValueMidgame; else moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m))) - -int(pos.midgame_value_of_piece_on(move_to(m))) / 64; + -int(pos.type_of_piece_on(move_from(m))); } } -/// find_best_index() loops across the moves and returns index of -/// the highest scored one. - -int MovePicker::find_best_index() { - - int bestScore = -10000000, bestIndex = -1; - - for (int i = movesPicked; i < numOfMoves; i++) - if (moves[i].score > bestScore) - { - bestIndex = i; - bestScore = moves[i].score; - } - return bestIndex; +/// find_best_index() loops across the moves and returns index of +/// the highest scored one. + +int MovePicker::find_best_index() { + + int bestScore = -10000000, bestIndex = -1; + + for (int i = movesPicked; i < numOfMoves; i++) + if (moves[i].score > bestScore) + { + bestIndex = i; + bestScore = moves[i].score; + } + return bestIndex; } @@ -310,30 +320,25 @@ Move MovePicker::pick_move_from_list() { while (movesPicked < numOfMoves) { - int bestScore = -10000000; - bestIndex = -1; - for (int i = movesPicked; i < numOfMoves; i++) + bestIndex = find_best_index(); + + if (bestIndex != -1) // Found a possibly good capture { - if (moves[i].score < 0) + move = moves[bestIndex].move; + int seeValue = pos.see(move); + if (seeValue < 0) { // Losing capture, move it to the badCaptures[] array assert(numOfBadCaptures < 63); - badCaptures[numOfBadCaptures++] = moves[i]; - moves[i--] = moves[--numOfMoves]; - } - else if (moves[i].score > bestScore) - { - bestIndex = i; - bestScore = moves[i].score; + moves[bestIndex].score = seeValue; + badCaptures[numOfBadCaptures++] = moves[bestIndex]; + moves[bestIndex] = moves[--numOfMoves]; + continue; } - } - if (bestIndex != -1) // Found a good capture - { - move = moves[bestIndex].move; moves[bestIndex] = moves[movesPicked++]; if ( move != ttMove && move != mateKiller - && pos.move_is_legal(move, pinned)) + && pos.pl_move_is_legal(move, pinned)) return move; } } @@ -357,7 +362,7 @@ Move MovePicker::pick_move_from_list() { moves[bestIndex] = moves[movesPicked++]; if ( move != ttMove && move != mateKiller - && pos.move_is_legal(move, pinned)) + && pos.pl_move_is_legal(move, pinned)) return move; } } @@ -390,7 +395,7 @@ Move MovePicker::pick_move_from_list() { move = badCaptures[badCapturesPicked++].move; if ( move != ttMove && move != mateKiller - && pos.move_is_legal(move, pinned)) + && pos.pl_move_is_legal(move, pinned)) return move; } break; @@ -408,7 +413,7 @@ Move MovePicker::pick_move_from_list() { moves[bestIndex] = moves[movesPicked++]; // Remember to change the line below if we decide to hash the qsearch! // Maybe also postpone the legality check until after futility pruning? - if (/* move != ttMove && */ pos.move_is_legal(move, pinned)) + if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned)) return move; } } @@ -423,7 +428,7 @@ Move MovePicker::pick_move_from_list() { { move = moves[movesPicked++].move; // Remember to change the line below if we decide to hash the qsearch! - if (/* move != ttMove && */ pos.move_is_legal(move, pinned)) + if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned)) return move; } break; @@ -435,8 +440,8 @@ Move MovePicker::pick_move_from_list() { } -/// MovePicker::current_move_type() returns the type of the just -/// picked next move. It can be used in search to further differentiate +/// MovePicker::current_move_type() returns the type of the just +/// picked next move. It can be used in search to further differentiate /// according to the current move type: capture, non capture, escape, etc. MovePicker::MovegenPhase MovePicker::current_move_type() const {