X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=a7e5bdac78ba0a9bf17304de41380cd667a9f5f6;hp=10835e6872e832a06d36e51e77f22c93757c2d64;hb=afae86bfb49471113f14f9f0f56f2a08d052242f;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c
diff --git a/src/movepick.cpp b/src/movepick.cpp
index 10835e68..a7e5bdac 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -18,11 +18,6 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
#include "history.h"
@@ -31,11 +26,6 @@
#include "search.h"
#include "value.h"
-
-////
-//// Local definitions
-////
-
namespace {
enum MovegenPhase {
@@ -58,11 +48,6 @@ namespace {
}
-////
-//// Functions
-////
-
-
/// Constructor for the MovePicker class. Apart from the position for which
/// it is asked to pick legal moves, MovePicker also wants some information
/// to help it to return the presumably good moves first, to decide which
@@ -70,35 +55,54 @@ namespace {
/// 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, Value beta) : pos(p), H(h) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
+ SearchStack* ss, Value beta) : pos(p), H(h) {
int searchTT = ttm;
ttMoves[0].move = ttm;
- lastBadCapture = badCaptures;
badCaptureThreshold = 0;
+ badCaptures = moves + MOVES_MAX;
+
+ assert(d > DEPTH_ZERO);
pinned = p.pinned_pieces(pos.side_to_move());
- if (ss && !p.is_check())
+ if (p.is_check())
+ {
+ ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
+ phasePtr = EvasionsPhaseTable;
+ }
+ else
{
- ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
+ 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))
- {
// Consider sligtly negative captures as good if at low
// depth and far from beta.
- if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * OnePly)
+ if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
badCaptureThreshold = -PawnValueMidgame;
phasePtr = MainSearchPhaseTable;
- } else if (d == Depth(0))
+ }
+
+ phasePtr += int(!searchTT) - 1;
+ go_next_phase();
+}
+
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
+ : pos(p), H(h) {
+ int searchTT = ttm;
+ ttMoves[0].move = ttm;
+ ttMoves[1].move = MOVE_NONE;
+
+ assert(d <= DEPTH_ZERO);
+
+ pinned = p.pinned_pieces(pos.side_to_move());
+
+ if (p.is_check())
+ phasePtr = EvasionsPhaseTable;
+ else if (d >= DEPTH_QS_CHECKS)
phasePtr = QsearchWithChecksPhaseTable;
else
{
@@ -111,7 +115,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
searchTT = ttMoves[0].move = MOVE_NONE;
}
- phasePtr += !searchTT - 1;
+ phasePtr += int(!searchTT) - 1;
go_next_phase();
}
@@ -131,7 +135,7 @@ void MovePicker::go_next_phase() {
return;
case PH_GOOD_CAPTURES:
- lastMove = generate_captures(pos, moves);
+ lastMove = generate(pos, moves);
score_captures();
return;
@@ -141,32 +145,31 @@ void MovePicker::go_next_phase() {
return;
case PH_NONCAPTURES:
- lastMove = generate_noncaptures(pos, moves);
+ lastMove = generate(pos, moves);
score_noncaptures();
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 + MOVES_MAX;
return;
case PH_EVASIONS:
assert(pos.is_check());
- lastMove = generate_evasions(pos, moves);
- score_evasions_or_checks();
+ 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:
@@ -220,7 +223,6 @@ void MovePicker::score_noncaptures() {
Move m;
Piece piece;
Square from, to;
- int hs;
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
@@ -228,18 +230,11 @@ void MovePicker::score_noncaptures() {
from = move_from(m);
to = move_to(m);
piece = pos.piece_on(from);
- hs = H.move_ordering_score(piece, to);
-
- // Ensure history has always highest priority
- if (hs > 0)
- hs += 10000;
-
- // Gain table based scoring
- cur->score = hs + 16 * H.gain(piece, to);
+ cur->score = H.value(piece, to) + H.gain(piece, to);
}
}
-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
@@ -255,12 +250,12 @@ void MovePicker::score_evasions_or_checks() {
{
m = cur->move;
if ((seeScore = pos.see_sign(m)) < 0)
- cur->score = seeScore - HistoryMax; // Be sure are at the bottom
+ 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));
}
}
@@ -300,21 +295,19 @@ Move MovePicker::get_next_move() {
if (seeValue >= badCaptureThreshold)
return move;
- // Losing capture, move it to the badCaptures[] array, note
+ // Losing capture, move it to the tail of the array, note
// that move has now been already checked for legality.
- assert(int(lastBadCapture - badCaptures) < 63);
- lastBadCapture->move = move;
- lastBadCapture->score = seeValue;
- lastBadCapture++;
+ (--badCaptures)->move = move;
+ badCaptures->score = seeValue;
}
break;
case PH_KILLERS:
move = (curMove++)->move;
if ( move != MOVE_NONE
+ && move_is_legal(pos, move, pinned)
&& move != ttMoves[0].move
&& move != ttMoves[1].move
- && move_is_legal(pos, move, pinned)
&& !pos.move_is_capture(move))
return move;
break;
@@ -323,7 +316,7 @@ Move MovePicker::get_next_move() {
// Sort negative scored moves only when we get there
if (curMove == lastGoodNonCapture)
- insertion_sort(lastGoodNonCapture, lastMove);
+ insertion_sort(lastGoodNonCapture, lastMove);
move = (curMove++)->move;
if ( move != ttMoves[0].move
@@ -364,4 +357,3 @@ Move MovePicker::get_next_move() {
go_next_phase();
}
}
-