X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=187a3c513e0275a112c377919a40d62cbdebf586;hp=5f170297b2a26c9c9cae15f73a9415d33e0a0645;hb=a28c17ecb60918bae546ea6aa5b596b7a56d603e;hpb=714069e24839b5111ccf93a3170763c4b383f2dd diff --git a/src/movepick.cpp b/src/movepick.cpp index 5f170297..187a3c51 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 @@ -210,16 +211,20 @@ void MovePicker::score_captures() { // 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. + Move m; + int seeValue; + for (int i = 0; i < numOfMoves; i++) { - int seeValue = pos.see(moves[i].move); + m = moves[i].move; + seeValue = pos.see(m); if (seeValue >= 0) { - if (move_promotion(moves[i].move)) + if (move_promotion(m)) 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))); + moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m))) + -int(pos.type_of_piece_on(move_from(m))); } else moves[i].score = seeValue; } @@ -229,25 +234,25 @@ 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++) - { - m = moves[i].move; - - if (m == killer1) - hs = HistoryMax + 2; - else if (m == killer2) - hs = HistoryMax + 1; - else - 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); + Move m; + int hs; + + for (int i = 0; i < numOfMoves; i++) + { + m = moves[i].move; + + if (m == killer1) + hs = HistoryMax + 2; + else if (m == killer2) + hs = HistoryMax + 1; + else + 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); } }