X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=8d8060b55571f9b4420ba29a674e791ce48f58e9;hp=a562662e359e514d878b17879dcd18395d940553;hb=54b3d44194fb0d36a2b4c3cd6d473ec50a4c1ef1;hpb=0855d93de8cf7c68af616a2d5f384a7632470895

diff --git a/src/movepick.cpp b/src/movepick.cpp
index a562662e..8d8060b5 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -52,7 +52,7 @@ namespace {
 
   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_EVASIONS, 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};
 }
@@ -74,10 +74,11 @@ 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;
-  finished = false;
   lastBadCapture = badCaptures;
 
-  if (ss)
+  pinned = p.pinned_pieces(pos.side_to_move());
+
+  if (ss && !p.is_check())
   {
       ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
       searchTT |= ttMoves[1].move;
@@ -86,21 +87,16 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
   } else
       ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
 
-  Color us = pos.side_to_move();
-
-  dc = p.discovered_check_candidates(us);
-  pinned = p.pinned_pieces(us);
-
   if (p.is_check())
       phasePtr = EvasionsPhaseTable;
   else if (d > Depth(0))
-      phasePtr = MainSearchPhaseTable + !searchTT;
+      phasePtr = MainSearchPhaseTable;
   else if (d == Depth(0))
-      phasePtr = QsearchWithChecksPhaseTable + !searchTT;
+      phasePtr = QsearchWithChecksPhaseTable;
   else
-      phasePtr = QsearchWithoutChecksPhaseTable + !searchTT;
+      phasePtr = QsearchWithoutChecksPhaseTable;
 
-  phasePtr--;
+  phasePtr += !searchTT - 1;
   go_next_phase();
 }
 
@@ -145,7 +141,7 @@ void MovePicker::go_next_phase() {
   case PH_EVASIONS:
       assert(pos.is_check());
       lastMove = generate_evasions(pos, moves);
-      score_evasions();
+      score_evasions_or_checks();
       return;
 
   case PH_QCAPTURES:
@@ -154,12 +150,12 @@ void MovePicker::go_next_phase() {
       return;
 
   case PH_QCHECKS:
-      // Perhaps we should order moves move here?  FIXME
-      lastMove = generate_non_capture_checks(pos, moves, dc);
+      lastMove = generate_non_capture_checks(pos, moves);
+      score_evasions_or_checks();
       return;
 
   case PH_STOP:
-      lastMove = curMove + 1; // hack to be friendly for get_next_move()
+      lastMove = curMove + 1; // Avoids another go_next_phase() call
       return;
 
   default:
@@ -224,25 +220,26 @@ void MovePicker::score_noncaptures() {
           hs += 1000;
 
       // pst based scoring
-      cur->score = hs + pos.pst_delta<Position::MidGame>(piece, from, to);
+      cur->score = hs + mg_value(pos.pst_delta(piece, from, to));
   }
 }
 
-void MovePicker::score_evasions() {
-  // Always try ttMove as first. Then 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 negative SEE. This
-  // last group is ordered by the SEE score.
+void MovePicker::score_evasions_or_checks() {
+  // 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
+  // negative SEE. This last group is ordered by the SEE score.
   Move m;
   int seeScore;
 
+  // Skip if we don't have at least two moves to order
+  if (lastMove < moves + 2)
+      return;
+
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
       m = cur->move;
-      if (m == ttMoves[0].move)
-          cur->score = 2 * HistoryMax;
-      else if ((seeScore = pos.see_sign(m)) < 0)
+      if ((seeScore = pos.see_sign(m)) < 0)
           cur->score = seeScore;
       else if (pos.move_is_capture(m))
           cur->score =  pos.midgame_value_of_piece_on(move_to(m))
@@ -260,9 +257,6 @@ void MovePicker::score_evasions() {
 
 Move MovePicker::get_next_move() {
 
-  assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP);
-  assert( pos.is_check() || *phasePtr != PH_EVASIONS);
-
   Move move;
 
   while (true)
@@ -323,11 +317,6 @@ Move MovePicker::get_next_move() {
               return move;
 
           case PH_EVASIONS:
-              move = pick_best(curMove++, lastMove).move;
-              if (pos.pl_move_is_legal(move, pinned))
-                  return move;
-              break;
-
           case PH_QCAPTURES:
               move = pick_best(curMove++, lastMove).move;
               if (   move != ttMoves[0].move
@@ -360,14 +349,10 @@ Move MovePicker::get_next_move() {
 Move MovePicker::get_next_move(Lock &lock) {
 
    lock_grab(&lock);
-   if (finished)
-   {
-       lock_release(&lock);
-       return MOVE_NONE;
-   }
+
+   // Note that it is safe to call many times
+   // get_next_move() when phase == PH_STOP
    Move m = get_next_move();
-   if (m == MOVE_NONE)
-       finished = true;
 
    lock_release(&lock);
    return m;