X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=12fffdccd1d5ab0399ccbbc16b3e94fc573041d6;hp=901aa60e5625c766b797fd88d4dec2888b24ac69;hb=cff8877a1ae270d6f176d16dbcfd72a270e0600f;hpb=337ec0f3d0b402782c3704cc251c209393047dd9
diff --git a/src/movepick.cpp b/src/movepick.cpp
index 901aa60e..12fffdcc 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, 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
@@ -18,93 +18,94 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
-#include "history.h"
#include "movegen.h"
#include "movepick.h"
#include "search.h"
-#include "value.h"
-
-
-////
-//// Local definitions
-////
+#include "types.h"
namespace {
enum MovegenPhase {
- PH_TT_MOVES, // Transposition table move and mate killer
- PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
- PH_KILLERS, // Killer moves from the current ply
- PH_NONCAPTURES, // Non-captures and underpromotions
- PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
- PH_EVASIONS, // Check evasions
- PH_QCAPTURES, // Captures in quiescence search
- PH_QCHECKS, // Non-capture checks in quiescence search
+ PH_TT_MOVES, // Transposition table move and mate killer
+ PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
+ PH_KILLERS, // Killer moves from the current ply
+ PH_NONCAPTURES, // Non-captures and underpromotions
+ PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
+ PH_EVASIONS, // Check evasions
+ PH_QCAPTURES, // Captures in quiescence search
+ PH_QCHECKS, // Non-capture checks in quiescence search
PH_STOP
};
CACHE_LINE_ALIGNMENT
- const uint8_t MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
- const uint8_t EvasionsPhaseTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP};
- const uint8_t QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
- const uint8_t QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
+ const uint8_t MainSearchTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP };
+ const uint8_t EvasionTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP };
+ const uint8_t QsearchWithChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP };
+ const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP };
}
+bool MovePicker::isBadCapture() const { return phase == PH_BAD_CAPTURES; }
-////
-//// Functions
-////
-
-
-/// Constructor for the MovePicker class. Apart from the position for which
-/// it is asked to pick legal moves, MovePicker also wants some information
+/// Constructor for the MovePicker class. As arguments we pass information
/// to help it to return the presumably good moves first, to decide which
/// moves to return (in the quiescence search, for instance, we only want to
/// search captures, promotions and some checks) and about how important good
/// move ordering is at the current node.
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
- const History& h, SearchStack* ss) : pos(p), H(h) {
- int searchTT = ttm;
- ttMoves[0].move = ttm;
- lastBadCapture = badCaptures;
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
+ SearchStack* ss, Value beta) : pos(p), H(h) {
+ badCaptureThreshold = 0;
+ badCaptures = moves + MAX_MOVES;
- pinned = p.pinned_pieces(pos.side_to_move());
+ assert(d > DEPTH_ZERO);
- if (ss && !p.is_check())
+ if (p.in_check())
+ {
+ killers[0].move = killers[1].move = MOVE_NONE;
+ phasePtr = EvasionTable;
+ }
+ else
{
- ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
- searchTT |= ttMoves[1].move;
killers[0].move = ss->killers[0];
killers[1].move = ss->killers[1];
- } else
- ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
-
- if (p.is_check())
- phasePtr = EvasionsPhaseTable;
- else if (d > Depth(0))
- phasePtr = MainSearchPhaseTable;
- else if (d == Depth(0))
- phasePtr = QsearchWithChecksPhaseTable;
+
+ // Consider sligtly negative captures as good if at low
+ // depth and far from beta.
+ if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
+ badCaptureThreshold = -PawnValueMidgame;
+
+ phasePtr = MainSearchTable;
+ }
+
+ ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ phasePtr += int(ttMove == MOVE_NONE) - 1;
+ go_next_phase();
+}
+
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
+ : pos(p), H(h) {
+
+ assert(d <= DEPTH_ZERO);
+
+ if (p.in_check())
+ phasePtr = EvasionTable;
+ else if (d >= DEPTH_QS_CHECKS)
+ phasePtr = QsearchWithChecksTable;
else
{
- phasePtr = QsearchWithoutChecksPhaseTable;
+ phasePtr = QsearchWithoutChecksTable;
// 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))
- searchTT = ttMoves[0].move = MOVE_NONE;
+ if (ttm != MOVE_NONE && !pos.move_is_capture(ttm) && !move_is_promotion(ttm))
+ ttm = MOVE_NONE;
}
- phasePtr += !searchTT - 1;
+ ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ phasePtr += int(ttMove == MOVE_NONE) - 1;
go_next_phase();
}
@@ -119,12 +120,11 @@ void MovePicker::go_next_phase() {
switch (phase) {
case PH_TT_MOVES:
- curMove = ttMoves;
- lastMove = curMove + 2;
+ lastMove = curMove + 1;
return;
case PH_GOOD_CAPTURES:
- lastMove = generate_captures(pos, moves);
+ lastMove = generate(pos, moves);
score_captures();
return;
@@ -134,36 +134,35 @@ void MovePicker::go_next_phase() {
return;
case PH_NONCAPTURES:
- lastMove = generate_noncaptures(pos, moves);
+ lastMove = generate(pos, moves);
score_noncaptures();
- sort_moves(moves, lastMove);
+ sort_moves(moves, lastMove, &lastGoodNonCapture);
return;
case PH_BAD_CAPTURES:
- // Bad captures SEE value is already calculated so just sort them
- // to get SEE move ordering.
+ // Bad captures SEE value is already calculated so just pick
+ // them in order to get SEE move ordering.
curMove = badCaptures;
- lastMove = lastBadCapture;
+ lastMove = moves + MAX_MOVES;
return;
case PH_EVASIONS:
- assert(pos.is_check());
- lastMove = generate_evasions(pos, moves);
- score_evasions_or_checks();
+ assert(pos.in_check());
+ lastMove = generate(pos, moves);
+ score_evasions();
return;
case PH_QCAPTURES:
- lastMove = generate_captures(pos, moves);
+ lastMove = generate(pos, moves);
score_captures();
return;
case PH_QCHECKS:
- lastMove = generate_non_capture_checks(pos, moves);
- score_evasions_or_checks();
+ lastMove = generate(pos, moves);
return;
case PH_STOP:
- lastMove = curMove + 1; // Avoids another go_next_phase() call
+ lastMove = curMove + 1; // Avoid another go_next_phase() call
return;
default:
@@ -207,24 +206,19 @@ void MovePicker::score_captures() {
}
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;
- Piece piece;
- Square from, to;
+ Square from;
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
from = move_from(m);
- to = move_to(m);
- piece = pos.piece_on(from);
- cur->score = H.move_ordering_score(piece, to);
+ cur->score = H.value(pos.piece_on(from), move_to(m));
}
}
-void MovePicker::score_evasions_or_checks() {
+void MovePicker::score_evasions() {
// Try good captures ordered by MVV/LVA, then non-captures if
// destination square is not under attack, ordered by history
// value, and at the end bad-captures and non-captures with a
@@ -240,22 +234,21 @@ void MovePicker::score_evasions_or_checks() {
{
m = cur->move;
if ((seeScore = pos.see_sign(m)) < 0)
- cur->score = seeScore;
+ cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom
else if (pos.move_is_capture(m))
cur->score = pos.midgame_value_of_piece_on(move_to(m))
- - pos.type_of_piece_on(move_from(m)) + HistoryMax;
+ - pos.type_of_piece_on(move_from(m)) + History::MaxValue;
else
- cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
+ cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
}
}
/// MovePicker::get_next_move() is the most important method of the MovePicker
-/// class. It returns a new legal move every time it is called, until there
-/// are no more moves left.
-/// It picks the move with the biggest score from a list of generated moves taking
-/// care not to return the tt move if has already been searched previously.
-/// Note that this function is not thread safe so should be lock protected by
-/// caller when accessed through a shared MovePicker object.
+/// class. It returns a new pseudo legal move every time it is called, until there
+/// are no more moves left. It picks the move with the biggest score from a list
+/// of generated moves taking care not to return the tt move if has already been
+/// searched previously. Note that this function is not thread safe so should be
+/// lock protected by caller when accessed through a shared MovePicker object.
Move MovePicker::get_next_move() {
@@ -263,85 +256,76 @@ Move MovePicker::get_next_move() {
while (true)
{
- while (curMove != lastMove)
- {
- switch (phase) {
-
- case PH_TT_MOVES:
- move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned))
- return move;
- break;
-
- case PH_GOOD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
- if ( move != ttMoves[0].move
- && move != ttMoves[1].move
- && pos.pl_move_is_legal(move, pinned))
- {
- // Check for a non negative SEE now
- int seeValue = pos.see_sign(move);
- if (seeValue >= 0)
- return move;
-
- // Losing capture, move it to the badCaptures[] array, note
- // that move has now been already checked for legality.
- assert(int(lastBadCapture - badCaptures) < 63);
- lastBadCapture->move = move;
- lastBadCapture->score = seeValue;
- lastBadCapture++;
- }
- break;
-
- case PH_KILLERS:
- move = (curMove++)->move;
- if ( move != MOVE_NONE
- && move != ttMoves[0].move
- && move != ttMoves[1].move
- && move_is_legal(pos, move, pinned)
- && !pos.move_is_capture(move))
+ while (curMove == lastMove)
+ go_next_phase();
+
+ switch (phase) {
+
+ case PH_TT_MOVES:
+ curMove++;
+ return ttMove;
+ break;
+
+ case PH_GOOD_CAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ if (move != ttMove)
+ {
+ // Check for a non negative SEE now
+ int seeValue = pos.see_sign(move);
+ if (seeValue >= badCaptureThreshold)
return move;
- break;
-
- case PH_NONCAPTURES:
- move = (curMove++)->move;
- if ( move != ttMoves[0].move
- && move != ttMoves[1].move
- && move != killers[0].move
- && move != killers[1].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
- case PH_BAD_CAPTURES:
- move = pick_best(curMove++, lastMove).move;
+ // Losing capture, move it to the tail of the array, note
+ // that move has now been already checked for pseudo legality.
+ (--badCaptures)->move = move;
+ badCaptures->score = seeValue;
+ }
+ break;
+
+ case PH_KILLERS:
+ move = (curMove++)->move;
+ if ( move != MOVE_NONE
+ && pos.move_is_pl(move)
+ && move != ttMove
+ && !pos.move_is_capture(move))
return move;
+ break;
- case PH_EVASIONS:
- case PH_QCAPTURES:
- move = pick_best(curMove++, lastMove).move;
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
+ case PH_NONCAPTURES:
+ // Sort negative scored moves only when we get there
+ if (curMove == lastGoodNonCapture)
+ insertion_sort(lastGoodNonCapture, lastMove);
- case PH_QCHECKS:
- move = (curMove++)->move;
- if ( move != ttMoves[0].move
- && pos.pl_move_is_legal(move, pinned))
- return move;
- break;
+ move = (curMove++)->move;
+ if ( move != ttMove
+ && move != killers[0].move
+ && move != killers[1].move)
+ return move;
+ break;
- case PH_STOP:
- return MOVE_NONE;
+ case PH_BAD_CAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ return move;
- default:
- assert(false);
- break;
- }
+ case PH_EVASIONS:
+ case PH_QCAPTURES:
+ move = pick_best(curMove++, lastMove).move;
+ if (move != ttMove)
+ return move;
+ break;
+
+ case PH_QCHECKS:
+ move = (curMove++)->move;
+ if (move != ttMove)
+ return move;
+ break;
+
+ case PH_STOP:
+ return MOVE_NONE;
+
+ default:
+ assert(false);
+ break;
}
- go_next_phase();
}
}
-