X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=4bdfd37476fdf4844d2fe8431987c0a72a1f5491;hb=54f1c383d36f461a740eeaa93856b408e8d3faa3;hp=dd4743703f6ec9fae93f71c9e0c2d40fd17559a2;hpb=0007b43a91dde70f73edd846f0371200647acd25;p=stockfish
diff --git a/src/movepick.cpp b/src/movepick.cpp
index dd474370..4bdfd374 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -18,23 +18,13 @@
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 {
@@ -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
@@ -77,21 +62,22 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
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;
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_ZERO)
- {
// Consider sligtly negative captures as good if at low
// depth and far from beta.
if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
@@ -99,6 +85,23 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
phasePtr = MainSearchPhaseTable;
}
+
+ 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
@@ -132,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;
@@ -142,7 +145,7 @@ 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;
@@ -156,17 +159,17 @@ void MovePicker::go_next_phase() {
case PH_EVASIONS:
assert(pos.is_check());
- lastMove = generate_evasions(pos, moves);
+ 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);
+ lastMove = generate(pos, moves);
return;
case PH_STOP:
@@ -247,10 +250,10 @@ void MovePicker::score_evasions() {
{
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.value(pos.piece_on(move_from(m)), move_to(m));
}
@@ -277,7 +280,7 @@ Move MovePicker::get_next_move() {
case PH_TT_MOVES:
move = (curMove++)->move;
if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned))
+ && pos.move_is_legal(move, pinned))
return move;
break;
@@ -302,7 +305,7 @@ Move MovePicker::get_next_move() {
case PH_KILLERS:
move = (curMove++)->move;
if ( move != MOVE_NONE
- && move_is_legal(pos, move, pinned)
+ && pos.move_is_legal(move, pinned)
&& move != ttMoves[0].move
&& move != ttMoves[1].move
&& !pos.move_is_capture(move))
@@ -354,4 +357,3 @@ Move MovePicker::get_next_move() {
go_next_phase();
}
}
-