X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmovepick.cpp;h=589c27b3585383be0ac6823907f767b36696d36b;hb=939b621e5c67e9ef89b409fd773d38058341906c;hp=07e8ef9d97290b68db0bb17076dfd11fd00b1374;hpb=ae2f5f25cd8a6bc2762eefc032436052c0db679e;p=stockfish
diff --git a/src/movepick.cpp b/src/movepick.cpp
index 07e8ef9d..589c27b3 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
@@ -58,7 +72,7 @@ namespace {
/// move ordering is at the current node.
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
- SearchStack* ss, Value beta) : pos(p), H(h), depth(d) {
+ Search::Stack* ss, Value beta) : pos(p), H(h), depth(d) {
captureThreshold = 0;
badCaptures = moves + MAX_MOVES;
@@ -74,15 +88,18 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
killers[0].move = ss->killers[0];
killers[1].move = ss->killers[1];
- // Consider sligtly negative captures as good if at low
- // depth and far from beta.
+ // Consider sligtly negative captures as good if at low depth and far from beta
if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
captureThreshold = -PawnValueMidgame;
+ // Consider negative captures as good if still enough to reach beta
+ else if (ss && ss->eval > beta)
+ captureThreshold = beta - ss->eval;
+
phasePtr = MainSearchTable;
}
- ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
phasePtr += int(ttMove == MOVE_NONE) - 1;
go_next_phase();
}
@@ -103,7 +120,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, S
// Skip TT move if is not a capture or a promotion, this avoids
// qsearch tree explosion due to a possible perpetual check or
// similar rare cases when TT table is full.
- if (ttm != MOVE_NONE && !pos.move_is_capture_or_promotion(ttm))
+ if (ttm != MOVE_NONE && !pos.is_capture_or_promotion(ttm))
ttm = MOVE_NONE;
}
else
@@ -113,7 +130,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, S
ttm = MOVE_NONE;
}
- ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
phasePtr += int(ttMove == MOVE_NONE) - 1;
go_next_phase();
}
@@ -124,14 +141,14 @@ MovePicker::MovePicker(const Position& p, Move ttm, const History& h, PieceType
assert (!pos.in_check());
// In ProbCut we consider only captures better than parent's move
- captureThreshold = piece_value_midgame(Piece(parentCapture));
+ captureThreshold = PieceValueMidgame[Piece(parentCapture)];
phasePtr = ProbCutTable;
if ( ttm != MOVE_NONE
- && (!pos.move_is_capture(ttm) || pos.see(ttm) <= captureThreshold))
+ && (!pos.is_capture(ttm) || pos.see(ttm) <= captureThreshold))
ttm = MOVE_NONE;
- ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
phasePtr += int(ttMove == MOVE_NONE) - 1;
go_next_phase();
}
@@ -164,14 +181,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:
@@ -236,11 +254,11 @@ void MovePicker::score_captures() {
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
- cur->score = piece_value_midgame(pos.piece_on(move_to(m)))
- - piece_type(pos.piece_on(move_from(m)));
+ cur->score = PieceValueMidgame[pos.piece_on(move_to(m))]
+ - type_of(pos.piece_on(move_from(m)));
- if (move_is_promotion(m))
- cur->score += QueenValueMidgame;
+ if (is_promotion(m))
+ cur->score += PieceValueMidgame[Piece(promotion_piece_type(m))];
}
}
@@ -274,9 +292,9 @@ void MovePicker::score_evasions() {
m = cur->move;
if ((seeScore = pos.see_sign(m)) < 0)
cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom
- else if (pos.move_is_capture(m))
- cur->score = piece_value_midgame(pos.piece_on(move_to(m)))
- - piece_type(pos.piece_on(move_from(m))) + History::MaxValue;
+ else if (pos.is_capture(m))
+ cur->score = PieceValueMidgame[pos.piece_on(move_to(m))]
+ - type_of(pos.piece_on(move_from(m))) + History::MaxValue;
else
cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
}
@@ -306,7 +324,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 +334,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;
@@ -333,9 +350,9 @@ Move MovePicker::get_next_move() {
case PH_KILLERS:
move = (curMove++)->move;
if ( move != MOVE_NONE
- && pos.move_is_pl(move)
+ && pos.is_pseudo_legal(move)
&& move != ttMove
- && !pos.move_is_capture(move))
+ && !pos.is_capture(move))
return move;
break;
@@ -349,12 +366,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;