X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=c898127f3ecef51dd8b96b2bbf41737ed45082c7;hp=07e8ef9d97290b68db0bb17076dfd11fd00b1374;hb=10b24af98af777c58e8a11137075f24207f4746d;hpb=ae2f5f25cd8a6bc2762eefc032436052c0db679e
diff --git a/src/movepick.cpp b/src/movepick.cpp
index 07e8ef9d..c898127f 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -18,6 +18,7 @@
along with this program. If not, see .
*/
+#include
#include
#include "movegen.h"
@@ -49,6 +50,19 @@ namespace {
const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVE, PH_QCAPTURES, PH_STOP };
const uint8_t QsearchRecapturesTable[] = { PH_TT_MOVE, PH_QRECAPTURES, PH_STOP };
const uint8_t ProbCutTable[] = { PH_TT_MOVE, PH_GOOD_PROBCUT, PH_STOP };
+
+ // 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& move) { return move.score > 0; }
+
+ // Picks and pushes to the front the best move in range [firstMove, lastMove),
+ // 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* firstMove, MoveStack* lastMove)
+ {
+ std::swap(*firstMove, *std::max_element(firstMove, lastMove));
+ return firstMove;
+ }
}
/// Constructors for the MovePicker class. As arguments we pass information
@@ -164,14 +178,15 @@ void MovePicker::go_next_phase() {
case PH_NONCAPTURES_1:
lastNonCapture = lastMove = generate(pos, moves);
score_noncaptures();
- sort_moves(moves, lastNonCapture, &lastMove);
+ lastMove = std::partition(curMove, lastMove, has_positive_score);
+ sort(curMove, lastMove);
return;
case PH_NONCAPTURES_2:
curMove = lastMove;
lastMove = lastNonCapture;
if (depth >= 3 * ONE_PLY)
- insertion_sort(curMove, lastMove);
+ sort(curMove, lastMove);
return;
case PH_BAD_CAPTURES:
@@ -240,7 +255,7 @@ void MovePicker::score_captures() {
- piece_type(pos.piece_on(move_from(m)));
if (move_is_promotion(m))
- cur->score += QueenValueMidgame;
+ cur->score += piece_value_midgame(Piece(promotion_piece_type(m)));
}
}
@@ -306,7 +321,7 @@ Move MovePicker::get_next_move() {
break;
case PH_GOOD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
+ move = pick_best(curMove++, lastMove)->move;
if (move != ttMove)
{
assert(captureThreshold <= 0); // Otherwise we must use see instead of see_sign
@@ -316,15 +331,14 @@ Move MovePicker::get_next_move() {
if (seeValue >= captureThreshold)
return move;
- // Losing capture, move it to the tail of the array, note
- // that move has now been already checked for pseudo legality.
+ // Losing capture, move it to the tail of the array
(--badCaptures)->move = move;
badCaptures->score = seeValue;
}
break;
case PH_GOOD_PROBCUT:
- move = pick_best(curMove++, lastMove).move;
+ move = pick_best(curMove++, lastMove)->move;
if ( move != ttMove
&& pos.see(move) > captureThreshold)
return move;
@@ -349,12 +363,12 @@ Move MovePicker::get_next_move() {
break;
case PH_BAD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
+ move = pick_best(curMove++, lastMove)->move;
return move;
case PH_EVASIONS:
case PH_QCAPTURES:
- move = pick_best(curMove++, lastMove).move;
+ move = pick_best(curMove++, lastMove)->move;
if (move != ttMove)
return move;
break;