X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=69d60bade0f5fc93abeb087f1c6463fe1a241abc;hp=c6c25d7b42a53eff8daf1e19634367a25d37d310;hb=3ef4fdeaa01f4d41fc723d54c0a17cea712cf035;hpb=5ba85ef441fb12738732824092f74aa49149fcf9

diff --git a/src/movepick.cpp b/src/movepick.cpp
index c6c25d7b..69d60bad 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -46,6 +46,7 @@ namespace {
   const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP };
 }
 
+bool MovePicker::isBadCapture() const { return phase == PH_BAD_CAPTURES; }
 
 /// Constructor for the MovePicker class. Apart from the position for which
 /// it is asked to pick legal moves, MovePicker also wants some information
@@ -59,13 +60,13 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
   int searchTT = ttm;
   ttMoves[0].move = ttm;
   badCaptureThreshold = 0;
-  badCaptures = moves + MOVES_MAX;
+  badCaptures = moves + MAX_MOVES;
 
   assert(d > DEPTH_ZERO);
 
   pinned = p.pinned_pieces(pos.side_to_move());
 
-  if (p.is_check())
+  if (p.in_check())
   {
       ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
       phasePtr = EvasionTable;
@@ -99,7 +100,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
 
   pinned = p.pinned_pieces(pos.side_to_move());
 
-  if (p.is_check())
+  if (p.in_check())
       phasePtr = EvasionTable;
   else if (d >= DEPTH_QS_CHECKS)
       phasePtr = QsearchWithChecksTable;
@@ -110,7 +111,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
       // 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.move_is_capture(ttm) && !move_is_promotion(ttm))
           searchTT = ttMoves[0].move = MOVE_NONE;
   }
 
@@ -153,11 +154,11 @@ void MovePicker::go_next_phase() {
       // Bad captures SEE value is already calculated so just pick
       // them in order to get SEE move ordering.
       curMove = badCaptures;
-      lastMove = moves + MOVES_MAX;
+      lastMove = moves + MAX_MOVES;
       return;
 
   case PH_EVASIONS:
-      assert(pos.is_check());
+      assert(pos.in_check());
       lastMove = generate<MV_EVASION>(pos, moves);
       score_evasions();
       return;
@@ -216,18 +217,15 @@ void MovePicker::score_captures() {
 }
 
 void MovePicker::score_noncaptures() {
-  // Score by history and max gain for the 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.value(piece, to) + H.gain(piece, to);
+      cur->score = H.value(pos.piece_on(from), move_to(m));
   }
 }